Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit cc46d9f

Browse files
knizhnikkelvich
authored andcommitted
Fix bug in specifying recovery position
1 parent 4a9d25a commit cc46d9f

File tree

4 files changed

+3
-5
lines changed

4 files changed

+3
-5
lines changed

arbiter.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ static void MtmBroadcastMessage(MtmBuffer* txBuffer, MtmTransState* ts)
513513
int n = 1;
514514
for (i = 0; i < MtmNodes; i++)
515515
{
516-
if (TransactionIdIsValid(ts->xids[i])) {
516+
if (!BIT_CHECK(Mtm->disabledNodeMask, i) && TransactionIdIsValid(ts->xids[i])) {
517517
Assert(i+1 != MtmNodeId);
518518
MtmAppendBuffer(txBuffer, ts->xids[i], i, ts);
519519
n += 1;

multimaster.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1748,7 +1748,7 @@ MtmReplicationStartupHook(struct PGLogicalStartupHookArgs* args)
17481748
}
17491749
MtmLock(LW_EXCLUSIVE);
17501750
if (isRecoverySession) {
1751-
elog(WARNING, "Node %d start recovery of node %d", MtmNodeId, MtmReplicationNodeId);
1751+
elog(WARNING, "%d: Node %d start recovery of node %d", MyProcPid, MtmNodeId, MtmReplicationNodeId);
17521752
if (!BIT_CHECK(Mtm->disabledNodeMask, MtmReplicationNodeId-1)) {
17531753
BIT_SET(Mtm->disabledNodeMask, MtmReplicationNodeId-1);
17541754
Mtm->nNodes -= 1;
@@ -1778,7 +1778,6 @@ MtmReplicationTxnFilterHook(struct PGLogicalTxnFilterArgs* args)
17781778
bool res = Mtm->status != MTM_RECOVERY
17791779
&& (args->origin_id == InvalidRepOriginId
17801780
|| MtmIsRecoveredNode(MtmReplicationNodeId));
1781-
MTM_TRACE("%d: MtmReplicationTxnFilterHook->%d\n", MyProcPid, res);
17821781
return res;
17831782
}
17841783

pglogical_output.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,6 @@ pg_decode_origin_filter(LogicalDecodingContext *ctx,
489489
PGLogicalOutputData *data = ctx->output_plugin_private;
490490

491491
if (!call_txn_filter_hook(data, origin_id)) {
492-
elog(WARNING, "Record with origin %d is not sent to node %d", origin_id, MtmReplicationNodeId);
493492
return true;
494493
}
495494

pglogical_receiver.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ pglogical_receiver_main(Datum main_arg)
292292
}
293293
CommitTransactionCommand();
294294

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')",
296296
args->receiver_slot,
297297
(uint32) (originStartPos >> 32),
298298
(uint32) originStartPos,

0 commit comments

Comments
 (0)