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>
(cherry picked from commit 7f697b1938efb3972f03f25546bf807d5af9a26c)

diff --git a/ctdb/server/ctdb_monitor.c b/ctdb/server/ctdb_monitor.c
index 913e2721f98c47609fb96194d26966183cd86eb2..ab58ec485fe0bfb04de99b55434434358350b348 100644 (file)
--- 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.