Check for transaction status before waiting latch

knizhnik · knizhnik · commit 5ee48f49c122 · 2016-05-14T21:45:51.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -801,8 +801,13 @@ MtmPostPrepareTransaction(MtmCurrentTrans* x)
 		int nConfigChanges = Mtm->nConfigChanges;
 		/* wait votes from all nodes */
 		while (!ts->votingCompleted) {
-			MtmWatchdog();
 			MtmUnlock();
+			MtmWatchdog();
+			if (ts->status == TRANSACTION_STATUS_ABORTED) {
+				elog(WARNING, "Transaction %d(%s) is aborted by watchdog", x->xid, x->gid);				
+				x->status = TRANSACTION_STATUS_ABORTED;
+				return;
+			}
 			result = WaitLatch(&MyProc->procLatch, WL_LATCH_SET|WL_TIMEOUT, timeout);
 			if (result & WL_LATCH_SET) { 
 				ResetLatch(&MyProc->procLatch);			
