Reset latch

knizhnik · knizhnik · commit 883d36334444 · 2016-05-14T19:40:20.000+03:00
diff --git a/contrib/mmts/arbiter.c b/contrib/mmts/arbiter.c
@@ -776,9 +776,9 @@ static void MtmTransReceiver(Datum arg)
 							}
 							break;
 						  case MSG_PREPARED:
+							Assert(ts->nVotes < Mtm->nLiveNodes);
 						    if (ts->status != TRANSACTION_STATUS_ABORTED) { 
 								Assert(ts->status == TRANSACTION_STATUS_IN_PROGRESS);
-								Assert(ts->nVotes < Mtm->nLiveNodes);
 								if (msg->csn > ts->csn) {
 									ts->csn = msg->csn;
 									MtmSyncClock(ts->csn);
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -804,13 +804,13 @@ MtmPostPrepareTransaction(MtmCurrentTrans* x)
 			MtmUnlock();
 			MtmWatchdog();
 			result = WaitLatch(&MyProc->procLatch, WL_LATCH_SET|WL_TIMEOUT, timeout);
-			if (result & WL_TIMEOUT) { 
+			if (result & WL_LATCH_SET) { 
+				ResetLatch(&MyProc->procLatch);			
+			} else if (result & WL_TIMEOUT) { 
 				if (MtmGetSystemTime() > deadline) { 
 					MtmLock(LW_SHARED);
 					break;
 				}
-			} else { 
-				ResetLatch(&MyProc->procLatch);			
 			} 
 			MtmLock(LW_SHARED);
 		}

Original file line number	Diff line number	Diff line change
`@@ -804,13 +804,13 @@ MtmPostPrepareTransaction(MtmCurrentTrans* x)`
`804`	`804`	`MtmUnlock();`
`805`	`805`	`MtmWatchdog();`
`806`	`806`	`result = WaitLatch(&MyProc->procLatch, WL_LATCH_SET\|WL_TIMEOUT, timeout);`
`807`		`- if (result & WL_TIMEOUT) {`
	`807`	`+ if (result & WL_LATCH_SET) {`
	`808`	`+ ResetLatch(&MyProc->procLatch);`
	`809`	`+ } else if (result & WL_TIMEOUT) {`
`808`	`810`	`if (MtmGetSystemTime() > deadline) {`
`809`	`811`	`MtmLock(LW_SHARED);`
`810`	`812`	`break;`
`811`	`813`	`}`
`812`		`- } else {`
`813`		`- ResetLatch(&MyProc->procLatch);`
`814`	`814`	`}`
`815`	`815`	`MtmLock(LW_SHARED);`
`816`	`816`	`}`