Commit4e26210

committed

Fix bug in specifying recovery position

1 parent9dfc6a4 commit4e26210Copy full SHA for 4e26210

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -513,7 +513,7 @@ static void MtmBroadcastMessage(MtmBuffer* txBuffer, MtmTransState* ts)`
`513`	`513`	`intn=1;`
`514`	`514`	`for (i=0;i<MtmNodes;i++)`
`515`	`515`	`{`
`516`		`-if (TransactionIdIsValid(ts->xids[i])) {`
	`516`	`+if (!BIT_CHECK(Mtm->disabledNodeMask,i)&&TransactionIdIsValid(ts->xids[i])) {`
`517`	`517`	`Assert(i+1!=MtmNodeId);`
`518`	`518`	`MtmAppendBuffer(txBuffer,ts->xids[i],i,ts);`
`519`	`519`	`n+=1;`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1749,7 +1749,7 @@ MtmReplicationStartupHook(struct PGLogicalStartupHookArgs* args)`
`1749`	`1749`	`}`
`1750`	`1750`	`MtmLock(LW_EXCLUSIVE);`
`1751`	`1751`	`if (isRecoverySession) {`
`1752`		`-elog(WARNING,"Node %d start recovery of node %d",MtmNodeId,MtmReplicationNodeId);`
	`1752`	`+elog(WARNING,"%d:Node %d start recovery of node %d",MyProcPid,MtmNodeId,MtmReplicationNodeId);`
`1753`	`1753`	`if (!BIT_CHECK(Mtm->disabledNodeMask,MtmReplicationNodeId-1)) {`
`1754`	`1754`	`BIT_SET(Mtm->disabledNodeMask,MtmReplicationNodeId-1);`
`1755`	`1755`	`Mtm->nNodes-=1;`
`@@ -1779,7 +1779,6 @@ MtmReplicationTxnFilterHook(struct PGLogicalTxnFilterArgs* args)`
`1779`	`1779`	`boolres=Mtm->status!=MTM_RECOVERY`
`1780`	`1780`	`&& (args->origin_id==InvalidRepOriginId`
`1781`	`1781`	`\|\|MtmIsRecoveredNode(MtmReplicationNodeId));`
`1782`		`-MTM_TRACE("%d: MtmReplicationTxnFilterHook->%d\n",MyProcPid,res);`
`1783`	`1782`	`returnres;`
`1784`	`1783`	`}`
`1785`	`1784`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -489,7 +489,6 @@ pg_decode_origin_filter(LogicalDecodingContext *ctx,`
`489`	`489`	`PGLogicalOutputData*data=ctx->output_plugin_private;`
`490`	`490`
`491`	`491`	`if (!call_txn_filter_hook(data,origin_id)) {`
`492`		`-elog(WARNING,"Record with origin %d is not sent to node %d",origin_id,MtmReplicationNodeId);`
`493`	`492`	`return true;`
`494`	`493`	`}`
`495`	`494`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,7 @@ pglogical_receiver_main(Datum main_arg)`
`292`	`292`	`}`
`293`	`293`	`CommitTransactionCommand();`
`294`	`294`
`295`		`-appendPQExpBuffer(query,"START_REPLICATION SLOT \"%s\" LOGICAL %u/%u (\"startup_params_format\" '1', \"max_proto_version\" '%d', \"min_proto_version\" '%d', \"forward_changesets\" '1', \"mtm_replication_mode\" '%s')",`
	`295`	`+appendPQExpBuffer(query,"START_REPLICATION SLOT \"%s\" LOGICAL %x/%x (\"startup_params_format\" '1', \"max_proto_version\" '%d', \"min_proto_version\" '%d', \"forward_changesets\" '1', \"mtm_replication_mode\" '%s')",`
`296`	`296`	`args->receiver_slot,`
`297`	`297`	`(uint32) (originStartPos >>32),`
`298`	`298`	`(uint32)originStartPos,`

Comments

(0)