Do not drop slot on end of recovery and try to explicitly specify restart position for it

knizhnik · knizhnik · commit 05b687622729 · 2016-08-19T20:10:49.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -1791,6 +1791,8 @@ static void MtmInitialize()
 			Mtm->nodes[i].con = MtmConnections[i];
 			Mtm->nodes[i].flushPos = 0;
 			Mtm->nodes[i].lastHeartbeat = 0;
+			Mtm->nodes[i].restartLsn = 0;
+			Mtm->nodes[i].originId = InvalidRepOriginId;
 		}
 		PGSemaphoreCreate(&Mtm->votingSemaphore);
 		PGSemaphoreReset(&Mtm->votingSemaphore);
diff --git a/contrib/mmts/multimaster.h b/contrib/mmts/multimaster.h
@@ -146,6 +146,7 @@ typedef struct
 	XLogRecPtr  flushPos;
 	csn_t       oldestSnapshot; /* Oldest snapshot used by active transactions at this node */	
 	XLogRecPtr  restartLsn;
+	RepOriginId originId;
 } MtmNodeInfo;
 
 typedef struct MtmTransState
diff --git a/contrib/mmts/pglogical_apply.c b/contrib/mmts/pglogical_apply.c
@@ -507,11 +507,13 @@ MtmEndSession(bool unlock)
 static void
 process_remote_commit(StringInfo in)
 {
+	int         i;
 	uint8 		flags;
 	csn_t       csn;
 	const char *gid = NULL;	
 	XLogRecPtr  end_lsn;
 	XLogRecPtr  origin_lsn;
+	RepOriginId originId;
 	int         n_records;
 	/* read flags */
 	flags = pq_getmsgbyte(in);
@@ -526,9 +528,21 @@ process_remote_commit(StringInfo in)
 	replorigin_session_origin_lsn = pq_getmsgint64(in); /* commit_lsn */
 	end_lsn = pq_getmsgint64(in); /* end_lsn */
 	replorigin_session_origin_timestamp = pq_getmsgint64(in); /* commit_time */
-	origin_lsn = pq_getmsgint64(in); 
-	Mtm->nodes[MtmReplicationNodeId-1].restartLsn = origin_lsn;
-	
+
+	originId = (RepOriginId)pq_getmsgint(in, 2);
+	origin_lsn = pq_getmsgint64(in);
+
+	if (originId != InvalidRepOriginId) { 
+		for (i = 0; i < Mtm->nAllNodes; i++) { 
+			if (Mtm->nodes[i].originId == originId) { 
+				Mtm->nodes[i].restartLsn = origin_lsn;
+				break;
+			} 
+		}
+		if (i == Mtm->nAllNodes) { 
+			elog(WARNING, "Failed to map origin %d", originId);
+		}
+	}
 	Assert(replorigin_session_origin == InvalidRepOriginId);
 
 	switch(PGLOGICAL_XACT_EVENT(flags))
diff --git a/contrib/mmts/pglogical_proto.c b/contrib/mmts/pglogical_proto.c
@@ -183,6 +183,8 @@ pglogical_write_commit(StringInfo out, PGLogicalOutputData *data,
     pq_sendint64(out, commit_lsn);
     pq_sendint64(out, txn->end_lsn);
     pq_sendint64(out, txn->commit_time);
+
+	pq_sendint(out, txn->origin_id, 2);
 	pq_sendint64(out, txn->origin_lsn);
 
 	if (txn->xact_action == XLOG_XACT_COMMIT_PREPARED) { 
diff --git a/contrib/mmts/pglogical_receiver.c b/contrib/mmts/pglogical_receiver.c
@@ -272,7 +272,7 @@ pglogical_receiver_main(Datum main_arg)
 		}
 		
 		query = createPQExpBuffer();
-#if 1 /* Do we need to recreate slot ? */		
+#if 0 /* Do we need to recreate slot ? */		
 		if (mode == REPLMODE_RECOVERED) { /* recreate slot */
 			appendPQExpBuffer(query, "DROP_REPLICATION_SLOT \"%s\"", slotName);
 			res = PQexec(conn, query->data);
@@ -305,7 +305,7 @@ pglogical_receiver_main(Datum main_arg)
 		
 		/* Start logical replication at specified position */
 		if (mode == REPLMODE_RECOVERED) {
-			originStartPos = Mtm->nodes[nodeId].restartLsn;
+			originStartPos = Mtm->nodes[nodeId-1].restartLsn;
 		} 
 		if (originStartPos == 0) { 
 			StartTransactionCommand();
@@ -325,6 +325,7 @@ pglogical_receiver_main(Datum main_arg)
 				originStartPos = replorigin_get_progress(originId, false);
 				MTM_LOG1("Restart logical receiver at position %lx with origin=%d from node %d", originStartPos, originId, nodeId);
 			}
+			Mtm->nodes[nodeId-1].originId = originId;
 			CommitTransactionCommand();
 		}
 		

Original file line number	Diff line number	Diff line change
`@@ -1791,6 +1791,8 @@ static void MtmInitialize()`
`1791`	`1791`	`Mtm->nodes[i].con = MtmConnections[i];`
`1792`	`1792`	`Mtm->nodes[i].flushPos = 0;`
`1793`	`1793`	`Mtm->nodes[i].lastHeartbeat = 0;`
	`1794`	`+ Mtm->nodes[i].restartLsn = 0;`
	`1795`	`+ Mtm->nodes[i].originId = InvalidRepOriginId;`
`1794`	`1796`	`}`
`1795`	`1797`	`PGSemaphoreCreate(&Mtm->votingSemaphore);`
`1796`	`1798`	`PGSemaphoreReset(&Mtm->votingSemaphore);`
Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ pglogical_receiver_main(Datum main_arg)`
`272`	`272`	`}`
`273`	`273`
`274`	`274`	`query = createPQExpBuffer();`
`275`		`-#if 1 /* Do we need to recreate slot ? */`
	`275`	`+#if 0 /* Do we need to recreate slot ? */`
`276`	`276`	`if (mode == REPLMODE_RECOVERED) { /* recreate slot */`
`277`	`277`	`appendPQExpBuffer(query, "DROP_REPLICATION_SLOT \"%s\"", slotName);`
`278`	`278`	`res = PQexec(conn, query->data);`
`@@ -305,7 +305,7 @@ pglogical_receiver_main(Datum main_arg)`
`305`	`305`
`306`	`306`	`/* Start logical replication at specified position */`
`307`	`307`	`if (mode == REPLMODE_RECOVERED) {`
`308`		`- originStartPos = Mtm->nodes[nodeId].restartLsn;`
	`308`	`+ originStartPos = Mtm->nodes[nodeId-1].restartLsn;`
`309`	`309`	`}`
`310`	`310`	`if (originStartPos == 0) {`
`311`	`311`	`StartTransactionCommand();`
`@@ -325,6 +325,7 @@ pglogical_receiver_main(Datum main_arg)`
`325`	`325`	`originStartPos = replorigin_get_progress(originId, false);`
`326`	`326`	`MTM_LOG1("Restart logical receiver at position %lx with origin=%d from node %d", originStartPos, originId, nodeId);`
`327`	`327`	`}`
	`328`	`+ Mtm->nodes[nodeId-1].originId = originId;`
`328`	`329`	`CommitTransactionCommand();`
`329`	`330`	`}`
`330`	`331`