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

Commit 0df255b

Browse files
knizhnikkelvich
authored andcommitted
Fix XactLogAbortRecord
1 parent 112346a commit 0df255b

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

multimaster.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3320,6 +3320,8 @@ MtmReplicationStartupHook(struct PGLogicalStartupHookArgs* args)
33203320
MTM_LOG1("Recovered position of node %d is %lx", MtmReplicationNodeId, recoveredLSN);
33213321
if (Mtm->nodes[MtmReplicationNodeId-1].restartLSN < recoveredLSN) {
33223322
MTM_LOG2("[restartlsn] node %d: %lx -> %lx (MtmReplicationStartupHook)", MtmReplicationNodeId, Mtm->nodes[MtmReplicationNodeId-1].restartLSN, recoveredLSN);
3323+
Assert(Mtm->nodes[MtmReplicationNodeId-1].restartLSN == InvalidXLogRecPtr
3324+
|| recoveredLSN < Mtm->nodes[MtmReplicationNodeId-1].restartLSN + MtmMaxRecoveryLag);
33233325
Mtm->nodes[MtmReplicationNodeId-1].restartLSN = recoveredLSN;
33243326
}
33253327
} else {
@@ -3533,7 +3535,8 @@ bool MtmFilterTransaction(char* record, int size)
35333535
}
35343536
restart_lsn = origin_node == MtmReplicationNodeId ? end_lsn : origin_lsn;
35353537
if (Mtm->nodes[origin_node-1].restartLSN < restart_lsn) {
3536-
Assert(restart_lsn != InvalidXLogRecPtr);
3538+
Assert(Mtm->nodes[origin_node-1].restartLSN == InvalidXLogRecPtr
3539+
|| restart_lsn < Mtm->nodes[origin_node-1].restartLSN + MtmMaxRecoveryLag);
35373540
MTM_LOG2("[restartlsn] node %d: %lx -> %lx (MtmFilterTransaction)", MtmReplicationNodeId, Mtm->nodes[MtmReplicationNodeId-1].restartLSN, restart_lsn);
35383541
Mtm->nodes[origin_node-1].restartLSN = restart_lsn;
35393542
} else {

tests2/test_regression.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def setUpClass(self):
1515
@classmethod
1616
def tearDownClass(self):
1717
print('tearDown')
18-
#subprocess.check_call(['docker-compose','down'])
18+
subprocess.check_call(['docker-compose','down'])
1919

2020
def test_regression(self):
2121
# XXX: make smth clever here

0 commit comments

Comments
 (0)