diff options
| author | Martin Schwenke <martin@meltin.net> | 2013-06-19 10:58:14 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@gmail.com> | 2013-06-22 15:51:02 +1000 |
| commit | 6a52a87028c653edbcede161e96857ff37d802ee (patch) | |
| tree | 53dbcedfd10505f4b15c35a84b97cf6af0e22e8b /ctdb/server/ctdb_monitor.c | |
| parent | 01d879806bc772cff66134dd3bcece9c2cedbac0 (diff) | |
| download | samba-6a52a87028c653edbcede161e96857ff37d802ee.tar.gz | |
ctdbd: Refactor shutdown sequence
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit b32fd04bfbf33062d45365b37a7247e272a76ceb)
Diffstat (limited to 'ctdb/server/ctdb_monitor.c')
| -rw-r--r-- | ctdb/server/ctdb_monitor.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/ctdb/server/ctdb_monitor.c b/ctdb/server/ctdb_monitor.c index 1608804c308..70ca47d6416 100644 --- a/ctdb/server/ctdb_monitor.c +++ b/ctdb/server/ctdb_monitor.c @@ -294,16 +294,7 @@ static void ctdb_wait_until_recovered(struct event_context *ev, struct timed_eve DEBUG(DEBUG_ALERT,(__location__ "ctdb_recheck_persistent_health() failed (%llu times) - prepare shutdown\n", (unsigned long long)ctdb->db_persistent_check_errors)); - ctdb_stop_recoverd(ctdb); - ctdb_stop_keepalive(ctdb); - ctdb_stop_monitoring(ctdb); - ctdb_release_all_ips(ctdb); - if (ctdb->methods != NULL) { - ctdb->methods->shutdown(ctdb); - } - ctdb_event_script(ctdb, CTDB_EVENT_SHUTDOWN); - DEBUG(DEBUG_ALERT,("ctdb_recheck_persistent_health() failed - Stopping CTDB daemon\n")); - exit(11); + ctdb_shutdown_sequence(ctdb, 11); } ctdb->db_persistent_check_errors = 0; |