ctdb-daemon: Start as disabled means PERMANENTLY_DISABLED
authorMartin Schwenke <martin@meltin.net>
Fri, 9 Jul 2021 04:02:28 +0000 (14:02 +1000)
committerAmitay Isaacs <amitay@samba.org>
Thu, 9 Sep 2021 01:46:49 +0000 (01:46 +0000)
DISABLED is UNHEALTHY | PERMANENTLY_DISABLED, which is not what is
intended here.  Luckily, it doesn't do any harm because nodes are
marked unhealthy at startup anyway.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14784
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
ctdb/server/ctdb_daemon.c

index e204bae73ad82d54bb33c12ca48c4250054501a7..0896ba08f9072780c99b57af3fff4231d0ffd66b 100644 (file)
@@ -1274,7 +1274,7 @@ static void initialise_node_flags (struct ctdb_context *ctdb)
        /* do we start out in DISABLED mode? */
        if (ctdb->start_as_disabled != 0) {
                D_ERR("This node is configured to start in DISABLED state\n");
-               node->flags |= NODE_FLAGS_DISABLED;
+               node->flags |= NODE_FLAGS_PERMANENTLY_DISABLED;
        }
        /* do we start out in STOPPED mode? */
        if (ctdb->start_as_stopped != 0) {