Commit7f5318f

authored and

committed

Check for transaction status before waiting latch

1 parent4a96cd3 commit7f5318fCopy full SHA for 7f5318f

File tree

-1

lines changed

-1

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -800,8 +800,13 @@ MtmPostPrepareTransaction(MtmCurrentTrans* x)`
`800`	`800`	`intnConfigChanges=Mtm->nConfigChanges;`
`801`	`801`	`/* wait votes from all nodes */`
`802`	`802`	`while (!ts->votingCompleted) {`
`803`		`-MtmWatchdog();`
`804`	`803`	`MtmUnlock();`
	`804`	`+MtmWatchdog();`
	`805`	`+if (ts->status==TRANSACTION_STATUS_ABORTED) {`
	`806`	`+elog(WARNING,"Transaction %d(%s) is aborted by watchdog",x->xid,x->gid);`
	`807`	`+x->status=TRANSACTION_STATUS_ABORTED;`
	`808`	`+return;`
	`809`	`+}`
`805`	`810`	`result=WaitLatch(&MyProc->procLatch,WL_LATCH_SET\|WL_TIMEOUT,timeout);`
`806`	`811`	`if (result&WL_LATCH_SET) {`
`807`	`812`	`ResetLatch(&MyProc->procLatch);`

Comments

(0)