Commit10f7b9e

knizhnik

authored and

kelvich

committed

Fix problem with suspended transaction

1 parent7b14ccc commit10f7b9eCopy full SHA for 10f7b9e

File tree

1 file changed

-1

lines changed

multimaster.c

1 file changed

-1

lines changed

`‎multimaster.c`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -319,6 +319,9 @@ void MtmLock(LWLockMode mode)`
`319`	`319`	`timestamp_tstart,stop;`
`320`	`320`	`start=MtmGetSystemTime();`
`321`	`321`	`#endif`
	`322`	`+if (MyProc==NULL) {/* Can not wait if have no PGPROC. It can happen at process exit. TODO: without lock we can get race condition and corrupt Mtm state */`
	`323`	`+return;`
	`324`	`+}`
`322`	`325`	`LWLockAcquire((LWLockId)&Mtm->locks[MTM_STATE_LOCK_ID],mode);`
`323`	`326`	`#ifDEBUG_LEVEL>1`
`324`	`327`	`stop=MtmGetSystemTime();`
`@@ -340,6 +343,9 @@ void MtmUnlock(void)`
`340`	`343`	`Assert(Mtm->lastLockHolder==MyProcPid);`
`341`	`344`	`return;`
`342`	`345`	`}`
	`346`	`+if (MyProc==NULL) {/* If we have no PGPROC, then lock was not obtained. */`
	`347`	`+return;`
	`348`	`+}`
`343`	`349`	`Mtm->lastLockHolder=0;`
`344`	`350`	`LWLockRelease((LWLockId)&Mtm->locks[MTM_STATE_LOCK_ID]);`
`345`	`351`	`}`
`@@ -4584,10 +4590,10 @@ static bool MtmTwoPhaseCommit(MtmCurrentTrans* x)`
`4584`	`4590`	`MTM_ELOG(WARNING,"Failed to prepare transaction %s (%llu)",x->gid, (long64)x->xid);`
`4585`	`4591`	`}else {`
`4586`	`4592`	`CommitTransactionCommand();`
	`4593`	`+StartTransactionCommand();`
`4587`	`4594`	`if (x->isSuspended) {`
`4588`	`4595`	`MTM_ELOG(WARNING,"Transaction %s (%llu) is left in prepared state because coordinator node is not online",x->gid, (long64)x->xid);`
`4589`	`4596`	`}else {`
`4590`		`-StartTransactionCommand();`
`4591`	`4597`	`Assert(x->isActive);`
`4592`	`4598`	`if (x->status==TRANSACTION_STATUS_ABORTED) {`
`4593`	`4599`	`FinishPreparedTransaction(x->gid, false);`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit10f7b9e

File tree

1 file changed

1 file changed

`‎multimaster.c`

0 commit comments