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

Commit 85e0e79

Browse files
committed
just disable
1 parent 83b1c02 commit 85e0e79

File tree

3 files changed

+25
-24
lines changed

3 files changed

+25
-24
lines changed

multimaster.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3563,13 +3563,13 @@ MtmReplicationStartupHook(struct PGLogicalStartupHookArgs* args)
35633563
ulong64 recoveredLSN;
35643564
sscanf(strVal(elem->arg), "%llx", &recoveredLSN);
35653565
MTM_LOG1("Recovered position of node %d is %llx", MtmReplicationNodeId, recoveredLSN);
3566-
if (Mtm->nodes[MtmReplicationNodeId-1].restartLSN < recoveredLSN) {
3567-
MTM_LOG1("Advance restartLSN for node %d from %llx to %llx (MtmReplicationStartupHook)",
3568-
MtmReplicationNodeId, Mtm->nodes[MtmReplicationNodeId-1].restartLSN, recoveredLSN);
3569-
// Assert(Mtm->nodes[MtmReplicationNodeId-1].restartLSN == INVALID_LSN
3570-
// || recoveredLSN < Mtm->nodes[MtmReplicationNodeId-1].restartLSN + MtmMaxRecoveryLag);
3571-
Mtm->nodes[MtmReplicationNodeId-1].restartLSN = recoveredLSN;
3572-
}
3566+
// if (Mtm->nodes[MtmReplicationNodeId-1].restartLSN < recoveredLSN) {
3567+
// MTM_LOG1("Advance restartLSN for node %d from %llx to %llx (MtmReplicationStartupHook)",
3568+
// MtmReplicationNodeId, Mtm->nodes[MtmReplicationNodeId-1].restartLSN, recoveredLSN);
3569+
// // Assert(Mtm->nodes[MtmReplicationNodeId-1].restartLSN == INVALID_LSN
3570+
// // || recoveredLSN < Mtm->nodes[MtmReplicationNodeId-1].restartLSN + MtmMaxRecoveryLag);
3571+
// Mtm->nodes[MtmReplicationNodeId-1].restartLSN = recoveredLSN;
3572+
// }
35733573
} else {
35743574
MTM_ELOG(ERROR, "Recovered position is not specified");
35753575
}
@@ -3787,10 +3787,10 @@ bool MtmFilterTransaction(char* record, int size)
37873787
break;
37883788
}
37893789

3790-
if (event != PGLOGICAL_COMMIT_PREPARED)
3791-
return false;
3790+
return false;
37923791

37933792
restart_lsn = origin_node == MtmReplicationNodeId ? end_lsn : origin_lsn;
3793+
37943794
if (Mtm->nodes[origin_node-1].restartLSN < restart_lsn) {
37953795
MTM_LOG2("[restartlsn] node %d: %llx -> %llx (MtmFilterTransaction)", MtmReplicationNodeId, Mtm->nodes[MtmReplicationNodeId-1].restartLSN, restart_lsn);
37963796
if (event != PGLOGICAL_PREPARE) {

pglogical_apply.c

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -466,17 +466,18 @@ process_remote_message(StringInfo s)
466466
Assert(msg->origin_lsn == INVALID_LSN);
467467
msg->origin_lsn = MtmSenderWalEnd;
468468
}
469-
if (Mtm->nodes[origin_node-1].restartLSN < msg->origin_lsn) {
470-
MTM_LOG1("Receive logical abort message for transaction %s from node %d: %llx < %llx", msg->gid, origin_node, Mtm->nodes[origin_node-1].restartLSN, msg->origin_lsn);
471-
Mtm->nodes[origin_node-1].restartLSN = msg->origin_lsn;
472-
replorigin_session_origin_lsn = msg->origin_lsn;
473-
MtmRollbackPreparedTransaction(origin_node, msg->gid);
474-
} else {
475-
if (msg->origin_lsn != INVALID_LSN) {
476-
MTM_LOG1("Ignore rollback of transaction %s from node %d because it's LSN %llx <= %llx",
477-
msg->gid, origin_node, msg->origin_lsn, Mtm->nodes[origin_node-1].restartLSN);
478-
}
479-
}
469+
MtmRollbackPreparedTransaction(origin_node, msg->gid);
470+
// if (Mtm->nodes[origin_node-1].restartLSN < msg->origin_lsn) {
471+
// MTM_LOG1("Receive logical abort message for transaction %s from node %d: %llx < %llx", msg->gid, origin_node, Mtm->nodes[origin_node-1].restartLSN, msg->origin_lsn);
472+
// Mtm->nodes[origin_node-1].restartLSN = msg->origin_lsn;
473+
// replorigin_session_origin_lsn = msg->origin_lsn;
474+
// MtmRollbackPreparedTransaction(origin_node, msg->gid);
475+
// } else {
476+
// if (msg->origin_lsn != INVALID_LSN) {
477+
// MTM_LOG1("Ignore rollback of transaction %s from node %d because it's LSN %llx <= %llx",
478+
// msg->gid, origin_node, msg->origin_lsn, Mtm->nodes[origin_node-1].restartLSN);
479+
// }
480+
// }
480481
standalone = true;
481482
break;
482483
}

pglogical_receiver.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -349,10 +349,10 @@ pglogical_receiver_main(Datum main_arg)
349349
resetPQExpBuffer(query);
350350
Mtm->nodes[nodeId-1].manualRecovery = false;
351351
} else {
352-
if (Mtm->nodes[nodeId-1].restartLSN < originStartPos) {
353-
MTM_LOG1("Advance restartLSN for node %d: from %llx to %llx (pglogical_receiver_main)", nodeId, Mtm->nodes[nodeId-1].restartLSN, originStartPos);
354-
Mtm->nodes[nodeId-1].restartLSN = originStartPos;
355-
}
352+
// if (Mtm->nodes[nodeId-1].restartLSN < originStartPos) {
353+
// MTM_LOG1("Advance restartLSN for node %d: from %llx to %llx (pglogical_receiver_main)", nodeId, Mtm->nodes[nodeId-1].restartLSN, originStartPos);
354+
// Mtm->nodes[nodeId-1].restartLSN = originStartPos;
355+
// }
356356
MTM_LOG1("Restart logical receiver at position %llx from node %d", originStartPos, nodeId);
357357
}
358358

0 commit comments

Comments
 (0)