git.samba.org
/
bbaumbach
/
samba-autobuild
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4656b08
)
ctdb-daemon: Don't explicitly stop monitoring during shutdown
author
Martin Schwenke
<martin@meltin.net>
Mon, 11 Sep 2017 00:48:50 +0000
(10:48 +1000)
committer
Amitay Isaacs
<amitay@samba.org>
Thu, 14 Sep 2017 12:49:15 +0000
(14:49 +0200)
Monitoring is skipped when not in run state RUNNING, so remove the
dependency on the monitoring code.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
ctdb/server/ctdb_daemon.c
patch
|
blob
|
history
diff --git
a/ctdb/server/ctdb_daemon.c
b/ctdb/server/ctdb_daemon.c
index 8ae43517a8563ea99e084f525e991b76bde9ef3c..6a9547075dea16c497b318926b318cb0281cb073 100644
(file)
--- a/
ctdb/server/ctdb_daemon.c
+++ b/
ctdb/server/ctdb_daemon.c
@@
-1800,7
+1800,6
@@
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);