Maintain clique during major mode, but do not perform any actions based on that (like self-disabling)

kelvich · kelvich · commit 0124e8edf8fa · 2017-11-13T02:23:42.000+03:00
diff --git a/state.c b/state.c
@@ -324,6 +324,7 @@ void MtmOnNodeDisconnect(int nodeId)
 	// MtmRefreshClusterStatus();
 }
 
+// XXXX: make that event too
 void MtmOnNodeConnect(int nodeId)
 {
 	// if (!BIT_CHECK(SELF_CONNECTIVITY_MASK, nodeId-1))
@@ -451,12 +452,6 @@ MtmRefreshClusterStatus()
 		}
 	}
 
-	/*
-	 * Do not check clique with referee grant, because we can disable ourself.
-	 */
-	if (Mtm->refereeGrant)
-		return;
-
 	/*
 	 * Check for clique.
 	 */
@@ -500,6 +495,18 @@ MtmRefreshClusterStatus()
 
 	Mtm->clique = newClique;
 
+	/*
+	 * Do not perform any action based on clique with referee grant,
+	 * because we can disable ourself.
+	 * But we also need to maintain actual clique not disable ourselves
+	 * when neighbour node will come back and we erase refereeGrant.
+	 */
+	if (Mtm->refereeGrant)
+	{
+		MtmUnlock();
+		return;
+	}
+
 	for (i = 0; i < Mtm->nAllNodes; i++)
 	{
 		bool old_status = BIT_CHECK(Mtm->disabledNodeMask, i);
