From: Martin Schwenke <martin@meltin.net>
Date: Tue, 27 Jul 2021 05:50:54 +0000 (+1000)
Subject: ctdb-daemon: Ignore flag changes for disconnected nodes
X-Git-Tag: ldb-2.5.0~734
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f697b1938efb3972f03f25546bf807d5af9a26c;p=thirdparty%2Fsamba.git

ctdb-daemon: Ignore flag changes for disconnected nodes

If this node is not connected to a node then we shouldn't know
anything about it.  The state will be pushed later by the recovery
master.

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

diff --git a/ctdb/server/ctdb_monitor.c b/ctdb/server/ctdb_monitor.c
index 913e2721f98..ab58ec485fe 100644
--- a/ctdb/server/ctdb_monitor.c
+++ b/ctdb/server/ctdb_monitor.c
@@ -471,6 +471,11 @@ int32_t ctdb_control_modflags(struct ctdb_context *ctdb, TDB_DATA indata)
 		return -1;
 	}
 
+	if (node->flags & NODE_FLAGS_DISCONNECTED) {
+		DBG_DEBUG("Ignoring flag changes for disconnected node\n");
+		return 0;
+	}
+
 	/*
 	 * Remember the old flags.  We don't care what some other node
 	 * thought the old flags were - that's irrelevant.