Commit1794b3f

committed

extra check to skip replication after logical message was written to WAL

1 parent1e3bdee commit1794b3fCopy full SHA for 1794b3f

File tree

+12

-3

lines changed

+12

-3

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1659,7 +1659,7 @@ bool MtmRefreshClusterStatus(bool nowait, int testNodeId)`
`1659`	`1659`	`/* Interrupt voting for active transaction and abort them */`
`1660`	`1660`	`for (ts=Mtm->transListHead;ts!=NULL;ts=ts->next) {`
`1661`	`1661`	`MTM_LOG3("Active transaction gid='%s', coordinator=%d, xid=%d, status=%d, gtid.xid=%d",`
`1662`		`-ts->gid,ts->gtid.nхode,ts->xid,ts->status,ts->gtid.xid);`
	`1662`	`+ts->gid,ts->gtid.node,ts->xid,ts->status,ts->gtid.xid);`
`1663`	`1663`	`if (MtmIsCoordinator(ts)) {`
`1664`	`1664`	`if (!ts->votingCompleted&&disabled!=0&&ts->status!=TRANSACTION_STATUS_ABORTED) {`
`1665`	`1665`	`MtmAbortTransaction(ts);`
`@@ -3825,6 +3825,7 @@ static void MtmProcessUtility(Node parsetree, const char queryString,`
`3825`	`3825`	`{`
`3826`	`3826`	`MTM_LOG1("Xact accessed temp table, stopping replication");`
`3827`	`3827`	`MtmTx.isDistributed= false;/* Skip */`
	`3828`	`+MtmTx.snapshot=INVALID_CSN;`
`3828`	`3829`	`}`
`3829`	`3830`
`3830`	`3831`	`}`

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -112,12 +112,14 @@ pglogical_write_begin(StringInfo out, PGLogicalOutputData *data,`
`112`	`112`
`113`	`113`	`if (!isRecovery&&csn==INVALID_CSN) {`
`114`	`114`	`MtmIsFilteredTxn= true;`
`115`		`-}else {`
	`115`	`+MTM_LOG3("%d: pglogical_write_begin XID=%d filtered",MyProcPid,txn->xid);`
	`116`	`+}else {`
	`117`	`+MTM_LOG3("%d: pglogical_write_begin XID=%d sent",MyProcPid,txn->xid);`
	`118`	`+MtmIsFilteredTxn= false;`
`116`	`119`	`pq_sendbyte(out,'B');/* BEGIN */`
`117`	`120`	`pq_sendint(out,MtmNodeId,4);`
`118`	`121`	`pq_sendint(out,isRecovery ?InvalidTransactionId :txn->xid,4);`
`119`	`122`	`pq_sendint64(out,csn);`
`120`		`-MtmIsFilteredTxn= false;`
`121`	`123`	`MtmTransactionRecords=0;`
`122`	`124`	`}`
`123`	`125`	`}`
`@@ -126,6 +128,12 @@ static void`
`126`	`128`	`pglogical_write_message(StringInfoout,`
`127`	`129`	`constcharprefix,Sizesz,constcharmessage)`
`128`	`130`	`{`
	`131`	`+if (MtmIsFilteredTxn)`
	`132`	`+{`
	`133`	`+MTM_LOG3("%d: pglogical_write_message filtered",MyProcPid);`
	`134`	`+return;`
	`135`	`+}`
	`136`	`+`
`129`	`137`	`pq_sendbyte(out,'G');`
`130`	`138`	`pq_sendbytes(out,message,sz);`
`131`	`139`	`pq_sendbyte(out,'\0');`

Comments

(0)