Commit6a3ebc6

knizhnik

authored and

kelvich

committed

Fix bug in explicit 2pc commit

1 parent10f7b9e commit6a3ebc6Copy full SHA for 6a3ebc6

File tree

1 file changed

-4

lines changed

multimaster.c

1 file changed

-4

lines changed

`‎multimaster.c`

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -3412,7 +3412,7 @@ void MtmFinishPreparedTransaction(MtmTransState* ts, bool commit)`
`3412`	`3412`	`MtmTx.isActive= true;`
`3413`	`3413`	`FinishPreparedTransaction(ts->gid,commit);`
`3414`	`3414`	`if (commit) {`
`3415`		`-MTM_LOG2("Distributed transaction %s (%lld) is committed at %lld with LSN=%lld",ts->gid, (long64)ts->xid,MtmGetCurrentTime(), (long64)GetXLogInsertRecPtr());`
	`3415`	`+MTM_LOG1("Distributed transaction %s (%lld) is committed at %lld with LSN=%lld",ts->gid, (long64)ts->xid,MtmGetCurrentTime(), (long64)GetXLogInsertRecPtr());`
`3416`	`3416`	`}`
`3417`	`3417`	`if (!insideTransaction) {`
`3418`	`3418`	`CommitTransactionCommand();`
`@@ -4600,7 +4600,7 @@ static bool MtmTwoPhaseCommit(MtmCurrentTrans* x)`
`4600`	`4600`	`MTM_ELOG(ERROR,"Transaction %s (%llu) is aborted by DTM",x->gid, (long64)x->xid);`
`4601`	`4601`	`}else {`
`4602`	`4602`	`FinishPreparedTransaction(x->gid, true);`
`4603`		`-MTM_LOG2("Distributed transaction %s (%lld) is committed at %lld with LSN=%lld",x->gid, (long64)x->xid,MtmGetCurrentTime(), (long64)GetXLogInsertRecPtr());`
	`4603`	`+MTM_LOG1("Distributed transaction %s (%lld) is committed at %lld with LSN=%lld",x->gid, (long64)x->xid,MtmGetCurrentTime(), (long64)GetXLogInsertRecPtr());`
`4604`	`4604`	`}`
`4605`	`4605`	`}`
`4606`	`4606`	`}`
`@@ -4864,12 +4864,11 @@ static void MtmProcessUtility(Node parsetree, const char queryString,`
`4864`	`4864`	`MtmTx.isTwoPhase= true;`
`4865`	`4865`	`strcpy(MtmTx.gid,stmt->gid);`
`4866`	`4866`	`break;`
`4867`		`-/* nobreak */`
`4868`	`4867`	`caseTRANS_STMT_COMMIT_PREPARED:`
`4869`	`4868`	`caseTRANS_STMT_ROLLBACK_PREPARED:`
`4870`	`4869`	`Assert(!MtmTx.isTwoPhase);`
`4871`	`4870`	`strcpy(MtmTx.gid,stmt->gid);`
`4872`		`-MtmTx.isTwoPhase= true;`
	`4871`	`+//MtmTx.isTwoPhase = true;`
`4873`	`4872`	`break;`
`4874`	`4873`	`default:`
`4875`	`4874`	`break;`

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!

Commit6a3ebc6

File tree

1 file changed

1 file changed

`‎multimaster.c`

0 commit comments