refresh cluster state in MtmReplicationStartupHook

Author: knizhnik

multimaster.c

@@ -2491,9 +2491,9 @@ MtmReplicationMode MtmGetReplicationMode(int nodeId, sig_atomic_t volatile* shut
 		MtmSleep(STATUS_POLL_DELAY);
 	}
 	if (recovery) { 
-		MTM_LOG1("%d: Restart replication for node %d after end of recovery", MyProcPid, nodeId);
+		MTM_LOG1("%d: Restart replication frim node %d after end of recovery", MyProcPid, nodeId);
 	} else { 
-		MTM_LOG1("%d: Continue replication slot for node %d", MyProcPid, nodeId);
+		MTM_LOG1("%d: Continue replication from node %d", MyProcPid, nodeId);
 	}
 	/* After recovery completion we need to drop all other slots to avoid receive of redundant data */
 	return recovery ? REPLMODE_RECOVERED : REPLMODE_NORMAL;
@@ -2595,7 +2595,10 @@ MtmReplicationStartupHook(struct PGLogicalStartupHookArgs* args)
 			MtmCheckQuorum();
 		} else {
 			MtmUnlock();
-			elog(ERROR, "Disabled node %d tries to reconnect without recovery", MtmReplicationNodeId); 
+			MtmRefreshClusterStatus(true);
+			if (BIT_CHECK(Mtm->disabledNodeMask, MtmReplicationNodeId-1)) {
+				elog(ERROR, "Disabled node %d tries to reconnect without recovery", MtmReplicationNodeId); 
+			}
 		}
 	} else {
 		MTM_LOG1("Node %d start logical replication to node %d in normal mode", MtmNodeId, MtmReplicationNodeId); 

pglogical_receiver.c

@@ -612,7 +612,7 @@ pglogical_receiver_main(Datum main_arg)
 			{
 				ereport(LOG, (errmsg("%s: COPY Stream has abruptly ended...",
 									 worker_proc)));
-				break;
+				goto OnError;
 			}
 
 			/* Failure when reading copy stream, leave */

t/001_basic_recovery.pl

@@ -89,7 +89,7 @@
 diag("polling node 2");
 for (my $poller = 0; $poller < 3; $poller++) {
 	my $pollee = 2;
-	ok($cluster->poll($poller, 'postgres', $pollee, 10, 1), "node $pollee is online according to node $poller");
+	ok($cluster->poll($poller, 'postgres', $pollee, 1000, 1), "node $pollee is online according to node $poller");
 }
 
 diag("getting cluster state");