Return back error in MtmIsRecoveredNode() which was changed to warning in 85c7597. Also introduce MtmDeepUnlock()

kelvich · kelvich · commit 1fdf868240c2 · 2017-11-13T02:21:37.000+03:00
diff --git a/multimaster.c b/multimaster.c
@@ -395,6 +395,20 @@ void MtmUnlock(void)
 	LWLockRelease((LWLockId)&Mtm->locks[MTM_STATE_LOCK_ID]);
 }
 
+void MtmDeepUnlock(void)
+{
+	if (MtmLockCount > 0)
+		Assert(Mtm->lastLockHolder == MyProcPid);
+
+	/* If we have no PGPROC, then lock was not obtained. */
+	if (MyProc == NULL)
+		return;
+
+	MtmLockCount = 0;
+	Mtm->lastLockHolder = 0;
+	LWLockRelease((LWLockId)&Mtm->locks[MTM_STATE_LOCK_ID]);
+}
+
 void MtmLockNode(int nodeId, LWLockMode mode)
 {
 	Assert(nodeId > 0 && nodeId <= MtmMaxNodes*2);
@@ -2033,7 +2047,8 @@ bool MtmIsRecoveredNode(int nodeId)
 {
 	if (BIT_CHECK(Mtm->disabledNodeMask, nodeId-1)) {
 		if (!MtmIsRecoverySession) {
-			MTM_ELOG(WARNING, "Node %d is marked as disabled but is not in recovery mode", nodeId);
+			MtmDeepUnlock();
+			MTM_ELOG(ERROR, "Node %d is marked as disabled but is not in recovery mode", nodeId);
 		}
 		return true;
 	} else {
diff --git a/multimaster.h b/multimaster.h
@@ -399,6 +399,7 @@ extern void  MtmSendMessage(MtmArbiterMessage* msg);
 extern void  MtmAdjustSubtransactions(MtmTransState* ts);
 extern void  MtmLock(LWLockMode mode);
 extern void  MtmUnlock(void);
+extern void  MtmDeepUnlock(void);
 extern void  MtmLockNode(int nodeId, LWLockMode mode);
 extern bool  MtmTryLockNode(int nodeId, LWLockMode mode);
 extern void  MtmUnlockNode(int nodeId);
