summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonnie Sahlberg <ronniesahlberg@gmail.com>2012-02-21 19:00:33 +1100
committerRonnie Sahlberg <ronniesahlberg@gmail.com>2012-02-21 19:00:33 +1100
commitc47da8b028046e4e44f78cacca655bb1b642941d (patch)
tree504955c1ae0848601a2979b108d772f71567827b
parent574b47e23fd141e96357cc596fe215f7f5c5007b (diff)
downloadsamba-c47da8b028046e4e44f78cacca655bb1b642941d.tar.gz
samba-c47da8b028046e4e44f78cacca655bb1b642941d.tar.xz
samba-c47da8b028046e4e44f78cacca655bb1b642941d.zip
Log the "Received SHUTDOWN ..." first in the shutown process instead of last.
Sometimes ctdb is termnated ifrom the initscript if the shutdown takes too long an no message is logged. (This used to be ctdb commit d3542d43141c1548bab356fbdef34dfedb4f167f)
-rw-r--r--ctdb/server/ctdb_control.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ctdb/server/ctdb_control.c b/ctdb/server/ctdb_control.c
index c73458825c..36b76cdbcd 100644
--- a/ctdb/server/ctdb_control.c
+++ b/ctdb/server/ctdb_control.c
@@ -308,6 +308,7 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb,
return 0;
case CTDB_CONTROL_SHUTDOWN:
+ DEBUG(DEBUG_NOTICE,("Received SHUTDOWN command. Stopping CTDB daemon.\n"));
ctdb_stop_recoverd(ctdb);
ctdb_stop_keepalive(ctdb);
ctdb_stop_monitoring(ctdb);
@@ -316,7 +317,6 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb,
ctdb->methods->shutdown(ctdb);
}
ctdb_event_script(ctdb, CTDB_EVENT_SHUTDOWN);
- DEBUG(DEBUG_NOTICE,("Received SHUTDOWN command. Stopping CTDB daemon.\n"));
exit(0);
case CTDB_CONTROL_TAKEOVER_IPv4: