]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
ctdb-daemon: Switch banning code to use ctdb_node_become_inactive()
authorMartin Schwenke <martin@meltin.net>
Mon, 19 Aug 2019 11:52:57 +0000 (21:52 +1000)
committerKarolin Seeger <kseeger@samba.org>
Wed, 28 Aug 2019 07:36:30 +0000 (07:36 +0000)
There's no reason to avoid immediately setting recovery mode to active
and initiating freeze of databases.

This effectively reverts the following commits:

  d8f3b490bbb691c9916eed0df5b980c1aef23c85
  b4357a79d916b1f8ade8fa78563fbef0ce670aa9

The latter is now implemented using a control, resulting in looser
coupling.

See also the following commit:

  f8141e91a693912ea1107a49320e83702a80757a

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14087

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
(cherry picked from commit 0f5f7b7cf4e970f3f36c5e0b3d09e710fe90801a)

ctdb/server/ctdb_banning.c

index 9cd163645a17a6027f950688320334a53b5b81c4..11794dc5b0b7b8fa0daeff1b6d846c2327b1954b 100644 (file)
@@ -129,7 +129,7 @@ int32_t ctdb_control_set_ban_state(struct ctdb_context *ctdb, TDB_DATA indata)
                         ctdb_ban_node_event, ctdb);
 
        if (!already_banned) {
-               ctdb_local_node_got_banned(ctdb);
+               ctdb_node_become_inactive(ctdb);
        }
        return 0;
 }