Reset latch

Author: knizhnik

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);

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);
 		}