Commit215fbb1

authored and

committed

Fix bugs in 3PC implementation

1 parent0a3c6c0 commit215fbb1Copy full SHA for 215fbb1

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1311,6 +1311,7 @@ void MtmSend2PCMessage(MtmTransState* ts, MtmMessageCode cmd)`
`1311`	`1311`
`1312`	`1312`	`if (MtmIsCoordinator(ts)) {`
`1313`	`1313`	`inti;`
	`1314`	`+Assert(false);// All broadcasts are now done through logical decoding`
`1314`	`1315`	`for (i=0;i<Mtm->nAllNodes;i++)`
`1315`	`1316`	`{`
`1316`	`1317`	`if (BIT_CHECK(ts->participantsMask& ~Mtm->disabledNodeMask& ~ts->votedMask,i))`
`@@ -3228,9 +3229,10 @@ bool MtmFilterTransaction(char* record, int size)`
`3228`	`3229`	`origin_node!=0&&`
`3229`	`3230`	`(Mtm->status==MTM_RECOVERY\|\|origin_node==replication_node));`
`3230`	`3231`
`3231`		`-switch(PGLOGICAL_XACT_EVENT(flags))`
	`3232`	`+switch(PGLOGICAL_XACT_EVENT(flags))`
`3232`	`3233`	`{`
`3233`	`3234`	`casePGLOGICAL_PREPARE:`
	`3235`	`+casePGLOGICAL_PRECOMMIT_PREPARED:`
`3234`	`3236`	`casePGLOGICAL_ABORT_PREPARED:`
`3235`	`3237`	`gid=pq_getmsgstring(&s);`
`3236`	`3238`	`break;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@`
`39`	`39`	`#defineMTM_TXTRACE(tx,event)`
`40`	`40`	`#else`
`41`	`41`	`#defineMTM_TXTRACE(tx,event) \`
`42`		`-fprintf(stderr, "[MTM_TXTRACE], %s, %lld, %s, %d\n", tx->gid, (long long)MtmGetSystemTime(), event,getpid())`
	`42`	`+fprintf(stderr, "[MTM_TXTRACE], %s, %lld, %s, %d\n", tx->gid, (long long)MtmGetSystemTime(), event,MyProcPid)`
`43`	`43`	`#endif`
`44`	`44`
`45`	`45`	`#defineMULTIMASTER_NAME "multimaster"`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -625,7 +625,9 @@ process_remote_commit(StringInfo in)`
`625`	`625`	`{`
`626`	`626`	`casePGLOGICAL_PRECOMMIT_PREPARED:`
`627`	`627`	`{`
	`628`	`+Assert(!TransactionIdIsValid(MtmGetCurrentTransactionId()));`
`628`	`629`	`gid=pq_getmsgstring(in);`
	`630`	`+MTM_LOG2("%d: PGLOGICAL_PRECOMMIT_PREPARED %s",MyProcPid,gid);`
`629`	`631`	`MtmPrecommitTransaction(gid);`
`630`	`632`	`return;`
`631`	`633`	`}`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,8 @@ pglogical_write_commit(StringInfo out, PGLogicalOutputData *data,`
`192`	`192`	`else`
`193`	`193`	`Assert(false);`
`194`	`194`
`195`		`-if (flags==PGLOGICAL_COMMIT\|\|flags==PGLOGICAL_PREPARE\|\|flags==PGLOGICAL_PRECOMMIT_PREPARED) {`
	`195`	`+if (flags==PGLOGICAL_COMMIT\|\|flags==PGLOGICAL_PREPARE) {`
	`196`	`+/* COMMIT and PREPARE are preceded by BEGIN, which set MtmIsFilteredTxn flag */`
`196`	`197`	`if (MtmIsFilteredTxn) {`
`197`	`198`	`Assert(MtmTransactionRecords==0);`
`198`	`199`	`return;`

Comments

(0)