Correctly handle lock failure in MtmLock

knizhnik · kelvich · commit e6c75099d21c · 2017-11-13T02:17:38.000+03:00
diff --git a/multimaster.c b/multimaster.c
@@ -317,19 +317,22 @@ void MtmLock(LWLockMode mode)
 		atexit(MtmReleaseLocks);
 		MtmAtExitHookRegistered = true;
 	}
-	if (mode == LW_EXCLUSIVE || MtmLockCount != 0) { 
-		if (MtmLockCount++ != 0) { 
-			Assert(Mtm->lastLockHolder == MyProcPid);
-			return;
-		}
+	if (MtmLockCount != 0) { 
+		Assert(Mtm->lastLockHolder == MyProcPid);
+		MtmLockCount += 1;
+		return;
 	}
 	start = MtmGetSystemTime();
 	LWLockAcquire((LWLockId)&Mtm->locks[MTM_STATE_LOCK_ID], mode);
 	stop = MtmGetSystemTime();
 	if (stop > start + MSEC_TO_USEC(MtmHeartbeatSendTimeout)) { 
 		MTM_LOG1("%d: obtaining %s lock takes %lld microseconds", MyProcPid, (mode == LW_EXCLUSIVE ? "exclusive" : "shared"), stop - start);
 	}	
-	Mtm->lastLockHolder = MyProcPid;
+	if (mode == LW_EXCLUSIVE) { 
+		Assert(MtmLockCount == 0);
+		Mtm->lastLockHolder = MyProcPid;
+		MtmLockCount = 1;
+	}
 }
 
 void MtmUnlock(void)
