From: Martin Schwenke Date: Fri, 9 Jul 2021 04:02:28 +0000 (+1000) Subject: ctdb-daemon: Start as disabled means PERMANENTLY_DISABLED X-Git-Tag: ldb-2.5.0~744 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60c1ef146538d90f97b7823459f7548ca5fa6dd3;p=thirdparty%2Fsamba.git ctdb-daemon: Start as disabled means PERMANENTLY_DISABLED 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 Reviewed-by: Amitay Isaacs --- diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c index e204bae73ad..0896ba08f90 100644 --- a/ctdb/server/ctdb_daemon.c +++ b/ctdb/server/ctdb_daemon.c @@ -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) {