diff options
| author | Martin Schwenke <martin@meltin.net> | 2013-12-18 15:37:11 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@gmail.com> | 2014-01-17 17:59:41 +1100 |
| commit | e6304d1e1adc86fc9c1199feb7b4802614fbc70f (patch) | |
| tree | 5cd393af6ff5fe9d76f46c6311175bd13ca21e3f /ctdb/include/ctdb_private.h | |
| parent | 50e00b3e5224d53df0f3cc882e71737f928e01cd (diff) | |
| download | samba-e6304d1e1adc86fc9c1199feb7b4802614fbc70f.tar.gz samba-e6304d1e1adc86fc9c1199feb7b4802614fbc70f.tar.xz samba-e6304d1e1adc86fc9c1199feb7b4802614fbc70f.zip | |
ctdb/daemon: Untangle serialisation of 1st recovery -> startup -> monitor
At the moment ctdb_check_healthy() is overloaded to wait until the
first recovery is complete, handle the "startup" event and also
actually handle monitoring. This is untidy and hard to follow.
Instead, have the daemon explicitly wait for 1st recovery after the
"setup" event. When first recovery is complete, schedule a function
to handle the "startup" event. When the "startup" event succeeds then
explicitly enable monitoring.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/include/ctdb_private.h')
| -rw-r--r-- | ctdb/include/ctdb_private.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h index 5c18d87474f..eba4045083f 100644 --- a/ctdb/include/ctdb_private.h +++ b/ctdb/include/ctdb_private.h @@ -1067,7 +1067,7 @@ uint32_t ctdb_get_num_active_nodes(struct ctdb_context *ctdb); void ctdb_disable_monitoring(struct ctdb_context *ctdb); void ctdb_enable_monitoring(struct ctdb_context *ctdb); void ctdb_stop_monitoring(struct ctdb_context *ctdb); -void ctdb_start_monitoring(struct ctdb_context *ctdb); +void ctdb_wait_for_first_recovery(struct ctdb_context *ctdb); void ctdb_start_tcp_tickle_update(struct ctdb_context *ctdb); void ctdb_send_keepalive(struct ctdb_context *ctdb, uint32_t destnode); void ctdb_start_keepalive(struct ctdb_context *ctdb); |