The branch, master has been updated via c5f6e44b92210519d4bfc24611cae3f9978cc2e5 (commit) via da9e02085523e27fa29e35c60034f6a8aaaa81e8 (commit) via 42c3e4c5216000c370814441e38c7a8180047aaf (commit) via 4dfe85dc19eea7b3382a005f63e1a3ef824aea90 (commit) from 113c763f15ab1db3810f40504b60bab5d3f2f212 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit c5f6e44b92210519d4bfc24611cae3f9978cc2e5 Author: Ronnie Sahlberg <ronniesahlb...@gmail.com> Date: Thu Aug 4 13:49:02 2011 +1000 remove log message we dont need S1026492 commit da9e02085523e27fa29e35c60034f6a8aaaa81e8 Author: Ronnie Sahlberg <ronniesahlb...@gmail.com> Date: Thu Aug 4 13:47:52 2011 +1000 remove a non-error logmessage about persistent databases being healthy, as expected S1026492 commit 42c3e4c5216000c370814441e38c7a8180047aaf Author: Ronnie Sahlberg <ronniesahlb...@gmail.com> Date: Thu Aug 4 13:46:12 2011 +1000 remove a log message we dont need about "allow clients to attach to databases" S1026492 commit 4dfe85dc19eea7b3382a005f63e1a3ef824aea90 Author: Ronnie Sahlberg <ronniesahlb...@gmail.com> Date: Thu Aug 4 13:44:25 2011 +1000 Change the message when we start the daemon to "CTDB starting on node" S1026492 ----------------------------------------------------------------------- Summary of changes: server/ctdb_monitor.c | 3 --- server/ctdb_recoverd.c | 1 - server/ctdbd.c | 2 +- 3 files changed, 1 insertions(+), 5 deletions(-) Changeset truncated at 500 lines: diff --git a/server/ctdb_monitor.c b/server/ctdb_monitor.c index 640ee93..f0879d0 100644 --- a/server/ctdb_monitor.c +++ b/server/ctdb_monitor.c @@ -302,11 +302,8 @@ static void ctdb_wait_until_recovered(struct event_context *ev, struct timed_eve exit(11); } ctdb->db_persistent_check_errors = 0; - DEBUG(DEBUG_NOTICE,(__location__ - "ctdb_start_monitoring: ctdb_recheck_persistent_health() OK\n")); DEBUG(DEBUG_NOTICE,(__location__ " Recoveries finished. Running the \"startup\" event.\n")); - DEBUG(DEBUG_ERR,(__location__ " Allow clients to attach to databases.\n")); event_add_timed(ctdb->ev, ctdb->monitor->monitor_context, timeval_current(), ctdb_check_health, ctdb); diff --git a/server/ctdb_recoverd.c b/server/ctdb_recoverd.c index ab14225..2db9109 100644 --- a/server/ctdb_recoverd.c +++ b/server/ctdb_recoverd.c @@ -1638,7 +1638,6 @@ static int do_recovery(struct ctdb_recoverd *rec, DEBUG(DEBUG_ERR, (__location__ " Unable to setup public takeover addresses. ctdb_takeover_run() failed.\n")); rec->need_takeover_run = true; } - DEBUG(DEBUG_NOTICE, (__location__ " Recovery - takeip finished\n")); /* execute the "recovered" event script on all nodes */ ret = run_recovered_eventscript(ctdb, nodemap, "do_recovery"); diff --git a/server/ctdbd.c b/server/ctdbd.c index 9eaba1d..a8d956d 100644 --- a/server/ctdbd.c +++ b/server/ctdbd.c @@ -196,7 +196,7 @@ int main(int argc, const char *argv[]) exit(1); } - DEBUG(DEBUG_NOTICE,("Starting CTDB daemon\n")); + DEBUG(DEBUG_NOTICE,("CTDB starting on node\n")); gettimeofday(&ctdb->ctdbd_start_time, NULL); gettimeofday(&ctdb->last_recovery_started, NULL); -- CTDB repository