Use origin LSN for recovery

knizhnik · knizhnik · commit 597d46a46f27 · 2016-08-19T16:44:31.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -2407,6 +2407,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) 
@@ -2426,6 +2427,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/contrib/mmts/multimaster.h b/contrib/mmts/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
`@@ -2407,6 +2407,7 @@ void MtmReceiverStarted(int nodeId)`
`2407`	`2407`	`*/`
`2408`	`2408`	`MtmReplicationMode MtmGetReplicationMode(int nodeId, sig_atomic_t volatile* shutdown)`
`2409`	`2409`	`{`
	`2410`	`+ int i;`
`2410`	`2411`	`bool recovery = false;`
`2411`	`2412`
`2412`	`2413`	`while (Mtm->status != MTM_CONNECTED && Mtm->status != MTM_ONLINE)`
`@@ -2426,6 +2427,9 @@ MtmReplicationMode MtmGetReplicationMode(int nodeId, sig_atomic_t volatile* shut`
`2426`	`2427`	`Mtm->recoveryCount += 1;`
`2427`	`2428`	`Mtm->pglogicalNodeMask = 0;`
`2428`	`2429`	`FinishAllPreparedTransactions(false);`
	`2430`	`+ for (i = 0; i < Mtm->nAllNodes; i++) {`
	`2431`	`+ Mtm->nodes[i].restartLsn = 0;`
	`2432`	`+ }`
`2429`	`2433`	`return REPLMODE_RECOVERY;`
`2430`	`2434`	`}`
`2431`	`2435`	`}`