diff options
| author | Martin Schwenke <martin@meltin.net> | 2013-01-10 16:06:25 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@gmail.com> | 2013-05-24 14:08:06 +1000 |
| commit | 63577c96db3877417030f441268b3ec79bb82c2a (patch) | |
| tree | daf62bef0535c6bdbc496591b9276bb2b876b04a /ctdb/server/ctdb_ltdb_server.c | |
| parent | c5bcff6724b85bac1a6343f67034b81ebbb7a2c2 (diff) | |
| download | samba-63577c96db3877417030f441268b3ec79bb82c2a.tar.gz samba-63577c96db3877417030f441268b3ec79bb82c2a.tar.xz samba-63577c96db3877417030f441268b3ec79bb82c2a.zip | |
ctdbd: Replace ctdb->done_startup with ctdb->runstate
This allows states, including startup and shutdown states, to be
clearly tracked. This doesn't include regular runtime "states", which
are handled by node flags.
Introduce new functions ctdb_set_runstate(), runstate_to_string() and
runstate_from_string().
Signed-off-by: Martin Schwenke <martin@meltin.net>
Pair-programmed-with: Amitay Isaacs <amitay@gmail.com>
(This used to be ctdb commit 8076773a9924dcf8aff16f7d96b2b9ac383ecc28)
Diffstat (limited to 'ctdb/server/ctdb_ltdb_server.c')
| -rw-r--r-- | ctdb/server/ctdb_ltdb_server.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ctdb/server/ctdb_ltdb_server.c b/ctdb/server/ctdb_ltdb_server.c index 8b067039235..0426d96bdbc 100644 --- a/ctdb/server/ctdb_ltdb_server.c +++ b/ctdb/server/ctdb_ltdb_server.c @@ -656,7 +656,7 @@ int32_t ctdb_control_db_set_healthy(struct ctdb_context *ctdb, TDB_DATA indata) return -1; } - if (may_recover && !ctdb->done_startup) { + if (may_recover && ctdb->runstate == CTDB_RUNSTATE_STARTUP) { DEBUG(DEBUG_ERR, (__location__ " db %s become healthy - force recovery for startup\n", ctdb_db->db_name)); ctdb->recovery_mode = CTDB_RECOVERY_ACTIVE; @@ -794,7 +794,7 @@ static int ctdb_local_attach(struct ctdb_context *ctdb, const char *db_name, if (ctdb->max_persistent_check_errors > 0) { remaining_tries = 1; } - if (ctdb->done_startup) { + if (ctdb->runstate == CTDB_RUNSTATE_RUNNING) { remaining_tries = 0; } @@ -1086,9 +1086,9 @@ int32_t ctdb_control_db_attach(struct ctdb_context *ctdb, TDB_DATA indata, return -1; } - if (ctdb->recovery_mode == CTDB_RECOVERY_ACTIVE - && client->pid != ctdb->recoverd_pid - && !ctdb->done_startup) { + if (ctdb->recovery_mode == CTDB_RECOVERY_ACTIVE && + client->pid != ctdb->recoverd_pid && + ctdb->runstate < CTDB_RUNSTATE_RUNNING) { struct ctdb_deferred_attach_context *da_ctx = talloc(client, struct ctdb_deferred_attach_context); if (da_ctx == NULL) { |