diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2015-10-30 14:25:50 +1100 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2015-10-30 10:32:38 +0100 |
| commit | d8f3b490bbb691c9916eed0df5b980c1aef23c85 (patch) | |
| tree | 371cf398991212298ad6e756f0d6226550dd480d /ctdb/server | |
| parent | 30a6a2247b3d9e177398779544ef0d3e17e2bef7 (diff) | |
| download | samba-d8f3b490bbb691c9916eed0df5b980c1aef23c85.tar.gz | |
ctdb-banning: Do not set recovery mode to ACTIVE in daemon
When a node gets banned, it should go into recovery and freeze all
databases. We rely on the recovery daemon to detect the banned state
and put the node in recovery and freeze all databases.
Recent change in b4357a79d916b1f8ade8fa78563fbef0ce670aa9 took explicit
freezing out of banning code but left the setting of recovery mode
to ACTIVE. Recovery daemon will freeze databases only if the recovery
mode is NORMAL. Recovery mode set to ACTIVE is an indication that the
freeze has started.
Do not set the recovery mode to ACTIVE in banning. Let recovery daemon
take care of it.
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Autobuild-User(master): Martin Schwenke <martins@samba.org>
Autobuild-Date(master): Fri Oct 30 10:32:38 CET 2015 on sn-devel-104
Diffstat (limited to 'ctdb/server')
| -rw-r--r-- | ctdb/server/ctdb_banning.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ctdb/server/ctdb_banning.c b/ctdb/server/ctdb_banning.c index 3c5f8854890..ed85076172e 100644 --- a/ctdb/server/ctdb_banning.c +++ b/ctdb/server/ctdb_banning.c @@ -72,8 +72,9 @@ void ctdb_local_node_got_banned(struct ctdb_context *ctdb) ctdb_db->generation = INVALID_GENERATION; } - /* make sure we get frozen */ - ctdb->recovery_mode = CTDB_RECOVERY_ACTIVE; + /* Recovery daemon will set the recovery mode ACTIVE and freeze + * databases. + */ ctdb_release_all_ips(ctdb); } |