diff options
| author | Martin Schwenke <martin@meltin.net> | 2017-09-18 16:36:32 +1000 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2017-09-19 01:28:13 +0200 |
| commit | b0244d46b58231c5c89131bddd2f967596f1238e (patch) | |
| tree | 912bc098fc8f50e1263cc83398d769d89843ce5b /ctdb/server | |
| parent | d0d805977f3734a80ed09f81343e9b1d81ee819d (diff) | |
| download | samba-b0244d46b58231c5c89131bddd2f967596f1238e.tar.gz | |
Revert "ctdb-daemon: Don't explicitly stop monitoring during shutdown"
This reverts commit 19318d28354190a9cfafa1696e41c90351f85af9.
With this commit, a shutdown that occurs while the startup event is
running can cause an abort because the startup callback will try to
decrease the run state from SHUTDOWN to RUNNING.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/server')
| -rw-r--r-- | ctdb/server/ctdb_daemon.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c index 6a9547075de..8ae43517a85 100644 --- a/ctdb/server/ctdb_daemon.c +++ b/ctdb/server/ctdb_daemon.c @@ -1800,6 +1800,7 @@ void ctdb_shutdown_sequence(struct ctdb_context *ctdb, int exit_code) ctdb_set_runstate(ctdb, CTDB_RUNSTATE_SHUTDOWN); ctdb_stop_recoverd(ctdb); ctdb_stop_keepalive(ctdb); + ctdb_stop_monitoring(ctdb); ctdb_release_all_ips(ctdb); ctdb_event_script(ctdb, CTDB_EVENT_SHUTDOWN); ctdb_stop_eventd(ctdb); |