diff options
| author | Michael Adam <obnox@samba.org> | 2009-10-29 13:44:39 +0100 |
|---|---|---|
| committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2009-10-30 09:28:06 +1100 |
| commit | 1de0c6f807b6d5ecc4ef1af799bca338c2a41acb (patch) | |
| tree | 9f1139163e1ffdfd8ebb4732af787d3fd21bb2c8 /ctdb/server/ctdb_persistent.c | |
| parent | 7384dfe4a9060c36ab8d60658bf5f6a3049aff0f (diff) | |
| download | samba-1de0c6f807b6d5ecc4ef1af799bca338c2a41acb.tar.gz samba-1de0c6f807b6d5ecc4ef1af799bca338c2a41acb.tar.xz samba-1de0c6f807b6d5ecc4ef1af799bca338c2a41acb.zip | |
server: uniformly log db and client ids as 8-digit hex numbers in trans2_commit
Michael
(This used to be ctdb commit 2febdd23f754a2d4699bed36b941442ab362a376)
Diffstat (limited to 'ctdb/server/ctdb_persistent.c')
| -rw-r--r-- | ctdb/server/ctdb_persistent.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/ctdb/server/ctdb_persistent.c b/ctdb/server/ctdb_persistent.c index 6c2b2265f5..3197d04b4b 100644 --- a/ctdb/server/ctdb_persistent.c +++ b/ctdb/server/ctdb_persistent.c @@ -113,7 +113,7 @@ int32_t ctdb_control_trans2_commit(struct ctdb_context *ctdb, ctdb_db = find_ctdb_db(ctdb, m->db_id); if (ctdb_db == NULL) { DEBUG(DEBUG_ERR,(__location__ " ctdb_control_trans2_commit: " - "Unknown database 0x%08x\n", m->db_id)); + "Unknown database db_id[0x%08x]\n", m->db_id)); return -1; } @@ -139,7 +139,7 @@ int32_t ctdb_control_trans2_commit(struct ctdb_context *ctdb, case CTDB_CONTROL_PERSISTENT_STORE: if (ctdb_db->transaction_active) { DEBUG(DEBUG_ERR, (__location__ " trans2_commit client " - "db_id[%d] transaction active - " + "db_id[0x%08x] transaction active - " "refusing persistent store\n", client->db_id)); return -1; @@ -152,15 +152,15 @@ int32_t ctdb_control_trans2_commit(struct ctdb_context *ctdb, if (ctdb_db->transaction_active) { DEBUG(DEBUG_ERR,(__location__ " trans2_commit: there is" " already a transaction commit " - "active on db_id[%d] - forbidding " - "client_id[%d] to commit\n", + "active on db_id[0x%08x] - forbidding " + "client_id[0x%08x] to commit\n", ctdb_db->db_id, client->client_id)); return -1; } if (client->db_id != 0) { DEBUG(DEBUG_ERR,(__location__ " ERROR: trans2_commit: " - "client-db_id[%d] != 0 " - "(client_id[%d])\n", + "client-db_id[0x%08x] != 0 " + "(client_id[0x%08x])\n", client->db_id, client->client_id)); return -1; } @@ -175,8 +175,9 @@ int32_t ctdb_control_trans2_commit(struct ctdb_context *ctdb, /* already updated from the first commit */ if (client->db_id != m->db_id) { DEBUG(DEBUG_ERR,(__location__ " ERROR: trans2_commit " - "retry: client-db_id[%d] != db_id[%d]" - "(client_id[%d])\n", client->db_id, + "retry: client-db_id[0x%08x] != " + "db_id[0x%08x] (client_id[0x%08x])\n", + client->db_id, m->db_id, client->client_id)); return -1; } |