summaryrefslogtreecommitdiffstats
path: root/ctdb/common
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2007-05-29 13:48:30 +1000
committerAndrew Tridgell <tridge@samba.org>2007-05-29 13:48:30 +1000
commitbc891232b600d2c03688003213f5cb0ac6977f8c (patch)
tree3997619bbd5990a5b1ca0ba2241e737a9bbba808 /ctdb/common
parentedcaa0d6a051d69a82ad15e275605fffb8d26075 (diff)
downloadsamba-bc891232b600d2c03688003213f5cb0ac6977f8c.tar.gz
samba-bc891232b600d2c03688003213f5cb0ac6977f8c.tar.xz
samba-bc891232b600d2c03688003213f5cb0ac6977f8c.zip
fixed some debug messages
(This used to be ctdb commit 037f0149c0c0e65af0a1669b9a52586129e4b48f)
Diffstat (limited to 'ctdb/common')
-rw-r--r--ctdb/common/ctdb_daemon.c4
-rw-r--r--ctdb/common/ctdb_ltdb.c6
-rw-r--r--ctdb/common/ctdb_recoverd.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/ctdb/common/ctdb_daemon.c b/ctdb/common/ctdb_daemon.c
index 435c1b1ea3c..6b76c1824cf 100644
--- a/ctdb/common/ctdb_daemon.c
+++ b/ctdb/common/ctdb_daemon.c
@@ -617,11 +617,11 @@ static int ux_socket_bind(struct ctdb_context *ctdb)
strncpy(addr.sun_path, ctdb->daemon.name, sizeof(addr.sun_path));
if (bind(ctdb->daemon.sd, (struct sockaddr *)&addr, sizeof(addr)) == -1) {
- DEBUG(0,("Unable to bind on ctdb socket '%s', ctdb->daemon.name\n"));
+ DEBUG(0,("Unable to bind on ctdb socket '%s'\n", ctdb->daemon.name));
goto failed;
}
if (listen(ctdb->daemon.sd, 10) != 0) {
- DEBUG(0,("Unable to listen on ctdb socket '%s', ctdb->daemon.name\n"));
+ DEBUG(0,("Unable to listen on ctdb socket '%s'\n", ctdb->daemon.name));
goto failed;
}
diff --git a/ctdb/common/ctdb_ltdb.c b/ctdb/common/ctdb_ltdb.c
index 501d89a38b4..0347c46ae62 100644
--- a/ctdb/common/ctdb_ltdb.c
+++ b/ctdb/common/ctdb_ltdb.c
@@ -367,7 +367,7 @@ int32_t ctdb_control_db_attach(struct ctdb_context *ctdb, TDB_DATA indata,
for (tmp_db=ctdb->db_list;tmp_db;tmp_db=tmp_db->next) {
if (tmp_db->db_id == ctdb_db->db_id) {
DEBUG(0,("db_id 0x%x hash collision. name1='%s' name2='%s'\n",
- db_name, tmp_db->db_name));
+ tmp_db->db_id, db_name, tmp_db->db_name));
talloc_free(ctdb_db);
return -1;
}
@@ -448,7 +448,7 @@ int32_t ctdb_ltdb_update_seqnum(struct ctdb_context *ctdb, uint32_t db_id, uint3
ctdb_db = find_ctdb_db(ctdb, db_id);
if (!ctdb_db) {
- DEBUG(0,("Unknown db_id 0x%x in ctdb_ltdb_update_seqnum\n"));
+ DEBUG(0,("Unknown db_id 0x%x in ctdb_ltdb_update_seqnum\n", db_id));
return -1;
}
@@ -491,7 +491,7 @@ int32_t ctdb_ltdb_enable_seqnum(struct ctdb_context *ctdb, uint32_t db_id)
struct ctdb_db_context *ctdb_db;
ctdb_db = find_ctdb_db(ctdb, db_id);
if (!ctdb_db) {
- DEBUG(0,("Unknown db_id 0x%x in ctdb_ltdb_enable_seqnum\n"));
+ DEBUG(0,("Unknown db_id 0x%x in ctdb_ltdb_enable_seqnum\n", db_id));
return -1;
}
diff --git a/ctdb/common/ctdb_recoverd.c b/ctdb/common/ctdb_recoverd.c
index 3f8882ce79d..2dbc9e1ce6e 100644
--- a/ctdb/common/ctdb_recoverd.c
+++ b/ctdb/common/ctdb_recoverd.c
@@ -546,7 +546,7 @@ static int do_recovery(struct ctdb_context *ctdb,
if (ctdb->takeover.enabled) {
ret = ctdb_takeover_run(ctdb, nodemap);
if (ret != 0) {
- DEBUG(0, (__location__, " Unable to setup public takeover addresses\n"));
+ DEBUG(0, (__location__ " Unable to setup public takeover addresses\n"));
return -1;
}
}