Fix adding new node to multimaster

knizhnik · kelvich · commit 59f16a790022 · 2017-11-13T02:17:36.000+03:00
diff --git a/multimaster.c b/multimaster.c
@@ -3828,6 +3828,7 @@ mtm_add_node(PG_FUNCTION_ARGS)
 	}
 	if (!MtmIsBroadcast())
 	{
+		MtmBroadcastUtilityStmt(psprintf("select pg_create_logical_replication_slot('" MULTIMASTER_SLOT_PATTERN "', '" MULTIMASTER_NAME "')", Mtm->nAllNodes+1), true);
 		MtmBroadcastUtilityStmt(psprintf("select mtm.add_node('%s')", connStr), true);
 	} 
 	else 
diff --git a/pglogical_receiver.c b/pglogical_receiver.c
@@ -344,7 +344,7 @@ pglogical_receiver_main(Datum main_arg)
 				 * Them are either empty, either new node is synchronized using base_backup.
 				 * So we assume that LSNs are the same for local and remote node
 				 */
-				originStartPos = (Mtm->status == MTM_RECOVERY && Mtm->donorNodeId == nodeId) ? GetXLogInsertRecPtr() : INVALID_LSN;
+				originStartPos = INVALID_LSN;
 				MTM_LOG1("Start logical receiver at position %llx from node %d", originStartPos, nodeId);
 			} else { 
 				if (Mtm->nodes[nodeId-1].restartLSN < originStartPos) { 

Original file line number	Diff line number	Diff line change
`@@ -3828,6 +3828,7 @@ mtm_add_node(PG_FUNCTION_ARGS)`
`3828`	`3828`	`}`
`3829`	`3829`	`if (!MtmIsBroadcast())`
`3830`	`3830`	`{`
	`3831`	`+ MtmBroadcastUtilityStmt(psprintf("select pg_create_logical_replication_slot('" MULTIMASTER_SLOT_PATTERN "', '" MULTIMASTER_NAME "')", Mtm->nAllNodes+1), true);`
`3831`	`3832`	`MtmBroadcastUtilityStmt(psprintf("select mtm.add_node('%s')", connStr), true);`
`3832`	`3833`	`}`
`3833`	`3834`	`else`