Fix handling of mtm_restart_pos parameter

Author: knizhnik

Cluster.pm

@@ -108,6 +108,7 @@ sub configure
 			multimaster.max_nodes = 3
 			multimaster.ignore_tables_without_pk = true
 			multimaster.twopc_min_timeout = 2000
+            log_line_prefix = '%t: '
 		));
 
 		$node->append_conf("pg_hba.conf", qq(

multimaster.c

@@ -2679,6 +2679,13 @@ void MtmReceiverStarted(int nodeId)
 	MtmUnlock();
 }
 
+void MtmReleaseRecoverySlot(int nodeId)
+{
+	if (Mtm->recoverySlot == nodeId) { 
+		Mtm->recoverySlot = 0;
+	}
+}
+
 /* 
  * Determine when and how we should open replication slot.
  * Druing recovery we need to open only one replication slot from which node should receive all transactions.
@@ -2810,7 +2817,6 @@ MtmReplicationStartupHook(struct PGLogicalStartupHookArgs* args)
 			} else { 
 				elog(ERROR, "Replication mode is not specified");
 			}				
-			break;
 		} else if (strcmp("mtm_restart_pos", elem->defname) == 0) { 
 			if (elem->arg != NULL && strVal(elem->arg) != NULL) {
 				recoveryStartPos = intVal(elem->arg);

multimaster.h

@@ -348,6 +348,7 @@ extern bool MtmWatchdog(timestamp_t now);
 extern void MtmCheckHeartbeat(void);
 extern void MtmResetTransaction(void);
 extern void MtmUpdateLockGraph(int nodeId, void const* messageBody, int messageSize);
+extern void MtmReleaseRecoverySlot(int nodeId);
 extern PGconn *PQconnectdb_safe(const char *conninfo);
 
 

pglogical_receiver.c

@@ -649,6 +649,7 @@ pglogical_receiver_main(Datum main_arg)
 
 	  OnError:
 		PQfinish(conn);
+		MtmReleaseRecoverySlot(nodeId);
 		MtmSleep(RECEIVER_SUSPEND_TIMEOUT);		
 	}
     ByteBufferFree(&buf);