Clean up MtmCheckState

Author: kelvich

contrib/mmts/state.c

@@ -108,18 +108,15 @@ MtmSetClusterStatus(MtmNodeStatus status, char *statusReason)
 static void
 MtmCheckState(void)
 {
-	// int nVotingNodes = MtmGetNumberOfVotingNodes();
 	bool isEnabledState;
 	char *statusReason = "node is disabled by default";
 	MtmNodeStatus old_status;
-	int nEnabled   = countZeroBits(Mtm->disabledNodeMask, Mtm->nAllNodes);
-	int nConnected = countZeroBits(SELF_CONNECTIVITY_MASK, Mtm->nAllNodes);
-	int nReceivers = Mtm->nAllNodes - countZeroBits(Mtm->pglogicalReceiverMask, Mtm->nAllNodes);
-	int nSenders   = Mtm->nAllNodes - countZeroBits(Mtm->pglogicalSenderMask, Mtm->nAllNodes);
+	int nConnected = countZeroBits(EFFECTIVE_CONNECTIVITY_MASK, Mtm->nAllNodes);
 
 	old_status = Mtm->status;
 
-	MTM_LOG1("[STATE]   Status = (disabled=%s, unaccessible=%s, clique=%s, receivers=%s, senders=%s, total=%i, major=%d, stopped=%s)",
+	MTM_LOG1("[STATE]   %s: (disabled=%s, unaccessible=%s, clique=%s, receivers=%s, senders=%s, total=%i, major=%d, stopped=%s)",
+		MtmNodeStatusMnem[Mtm->status],
 		maskToString(Mtm->disabledNodeMask, Mtm->nAllNodes),
 		maskToString(SELF_CONNECTIVITY_MASK, Mtm->nAllNodes),
 		maskToString(Mtm->clique, Mtm->nAllNodes),
@@ -192,20 +189,26 @@ MtmCheckState(void)
 		 * in MTM_RECOVERED state.
 		 */
 		case MTM_RECOVERED:
-			if (nReceivers == nEnabled-1 && nSenders == nEnabled-1 && nEnabled == nConnected)
 			{
-				/*
-				 * It should be already cleaned by RECOVERY_CAUGHTUP, but
-				 * in major mode or with referee we can be working alone
-				 * so nobody will clean it.
-				 */
-				MTM_LOG1("[LOCK] release lock on MTM_RECOVERED switch");
-				BIT_CLEAR(Mtm->originLockNodeMask, MtmNodeId-1);
-				MtmSetClusterStatus(MTM_ONLINE, statusReason);
+				int nEnabled   = countZeroBits(Mtm->disabledNodeMask, Mtm->nAllNodes);
+				int nReceivers = Mtm->nAllNodes - countZeroBits(Mtm->pglogicalReceiverMask, Mtm->nAllNodes);
+				int nSenders   = Mtm->nAllNodes - countZeroBits(Mtm->pglogicalSenderMask, Mtm->nAllNodes);
 
-				if (old_status != Mtm->status)
-					MtmCheckState();
-				return;
+				if (nReceivers == nEnabled-1 && nSenders == nEnabled-1 && nEnabled == nConnected)
+				{
+					/*
+					* It should be already cleaned by RECOVERY_CAUGHTUP, but
+					* in major mode or with referee we can be working alone
+					* so nobody will clean it.
+					*/
+					MTM_LOG1("[LOCK] release lock on MTM_RECOVERED switch");
+					BIT_CLEAR(Mtm->originLockNodeMask, MtmNodeId-1);
+					MtmSetClusterStatus(MTM_ONLINE, statusReason);
+
+					if (old_status != Mtm->status)
+						MtmCheckState();
+					return;
+				}
 			}
 			break;