1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-24 02:04:21 +03:00

fixed some debug messages

(This used to be ctdb commit 037f0149c0c0e65af0a1669b9a52586129e4b48f)
This commit is contained in:
Andrew Tridgell 2007-05-29 13:48:30 +10:00
parent edcaa0d6a0
commit bc891232b6
6 changed files with 11 additions and 9 deletions

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;
}
}

View File

@ -945,7 +945,9 @@ int32_t ctdb_control_tcp_remove(struct ctdb_context *ctdb, TDB_DATA indata);
int32_t ctdb_control_startup(struct ctdb_context *ctdb, uint32_t vnn);
void ctdb_takeover_client_destructor_hook(struct ctdb_client *client);
int ctdb_event_script(struct ctdb_context *ctdb, const char *fmt, ...);
int ctdb_event_script(struct ctdb_context *ctdb, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3);
void ctdb_release_all_ips(struct ctdb_context *ctdb);
#endif

View File

@ -18,4 +18,4 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
void do_debug(const char *format, ...);
void do_debug(const char *format, ...) PRINTF_ATTRIBUTE(1, 2);

View File

@ -239,7 +239,7 @@ int ctdb_set_public_addresses(struct ctdb_context *ctdb, const char *alist)
}
if (nlines != ctdb->num_nodes) {
DEBUG(0,("Number of lines in %s does not match number of nodes!\n"));
DEBUG(0,("Number of lines in %s does not match number of nodes!\n", alist));
talloc_free(lines);
return -1;
}