Use origin LSN for recovery

knizhnik · kelvich · commit 5a72566f9b2c · 2017-11-13T02:17:31.000+03:00
diff --git a/multimaster.c b/multimaster.c
@@ -2429,6 +2429,7 @@ void MtmReceiverStarted(int nodeId)
  */
 MtmReplicationMode MtmGetReplicationMode(int nodeId, sig_atomic_t volatile* shutdown)
 {
+	int i;
 	bool recovery = false;
 
 	while (Mtm->status != MTM_CONNECTED && Mtm->status != MTM_ONLINE) 
@@ -2448,6 +2449,9 @@ MtmReplicationMode MtmGetReplicationMode(int nodeId, sig_atomic_t volatile* shut
 				Mtm->recoveryCount += 1;
 				Mtm->pglogicalNodeMask = 0;
 				FinishAllPreparedTransactions(false);
+				for (i = 0; i < Mtm->nAllNodes; i++) { 
+					Mtm->nodes[i].restartLsn = 0;
+				}
 				return REPLMODE_RECOVERY;
 			}
 		}
diff --git a/multimaster.h b/multimaster.h
@@ -145,6 +145,7 @@ typedef struct
 	int         receiverPid;
 	XLogRecPtr  flushPos;
 	csn_t       oldestSnapshot; /* Oldest snapshot used by active transactions at this node */	
+	XLogRecPtr  restartLsn;
 } MtmNodeInfo;
 
 typedef struct MtmTransState

Original file line number	Diff line number	Diff line change
`@@ -2429,6 +2429,7 @@ void MtmReceiverStarted(int nodeId)`
`2429`	`2429`	`*/`
`2430`	`2430`	`MtmReplicationMode MtmGetReplicationMode(int nodeId, sig_atomic_t volatile* shutdown)`
`2431`	`2431`	`{`
	`2432`	`+ int i;`
`2432`	`2433`	`bool recovery = false;`
`2433`	`2434`
`2434`	`2435`	`while (Mtm->status != MTM_CONNECTED && Mtm->status != MTM_ONLINE)`
`@@ -2448,6 +2449,9 @@ MtmReplicationMode MtmGetReplicationMode(int nodeId, sig_atomic_t volatile* shut`
`2448`	`2449`	`Mtm->recoveryCount += 1;`
`2449`	`2450`	`Mtm->pglogicalNodeMask = 0;`
`2450`	`2451`	`FinishAllPreparedTransactions(false);`
	`2452`	`+ for (i = 0; i < Mtm->nAllNodes; i++) {`
	`2453`	`+ Mtm->nodes[i].restartLsn = 0;`
	`2454`	`+ }`
`2451`	`2455`	`return REPLMODE_RECOVERY;`
`2452`	`2456`	`}`
`2453`	`2457`	`}`