Do not change cluster status because of pglogical errors

knizhnik · knizhnik · commit 296a57a27cae · 2016-06-01T17:53:47.000+03:00
diff --git a/contrib/mmts/arbiter.c b/contrib/mmts/arbiter.c
@@ -401,7 +401,7 @@ static int MtmConnectSocket(char const* host, int port, int max_attempts)
 				
 			/* Some node considered that I am dead, so switch to recovery mode */
 			if (BIT_CHECK(resp.disabledNodeMask, MtmNodeId-1)) { 
-				elog(WARNING, "Node %d think that I am dead", resp.node);
+				elog(WARNING, "Node %d thinks that I was dead", resp.node);
 				BIT_SET(Mtm->disabledNodeMask, MtmNodeId-1);
 				MtmSwitchClusterMode(MTM_RECOVERY);
 			}
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -2146,7 +2146,7 @@ MtmOnProcExit(int code, Datum arg)
 	if (MtmReplicationNodeId > 0) { 
 		Mtm->nodes[MtmReplicationNodeId-1].senderPid = -1;
 		MTM_LOG1("WAL-sender to %d is terminated", MtmReplicationNodeId); 
-		MtmOnNodeDisconnect(MtmReplicationNodeId);
+		/* MtmOnNodeDisconnect(MtmReplicationNodeId); */
 	}
 }
 
@@ -2242,7 +2242,7 @@ MtmReplicationShutdownHook(struct PGLogicalShutdownHookArgs* args)
 {
 	if (MtmReplicationNodeId >= 0) { 
 		MTM_LOG1("Logical replication to node %d is stopped", MtmReplicationNodeId); 
-		MtmOnNodeDisconnect(MtmReplicationNodeId);
+		/* MtmOnNodeDisconnect(MtmReplicationNodeId); */
 		MtmReplicationNodeId = -1; /* defuse on_proc_exit hook */
 	}
 }
diff --git a/contrib/mmts/pglogical_receiver.c b/contrib/mmts/pglogical_receiver.c
@@ -275,7 +275,7 @@ pglogical_receiver_main(Datum main_arg)
 				PQclear(res);
 				ereport(ERROR, (errmsg("%s: Could not create logical slot",
 									   worker_proc)));
-				MtmOnNodeDisconnect(nodeId);
+				/* MtmOnNodeDisconnect(nodeId); */
 				proc_exit(1);
 			}
 		}
@@ -317,7 +317,7 @@ pglogical_receiver_main(Datum main_arg)
 		PQclear(res);
 		ereport(WARNING, (errmsg("%s: Could not start logical replication",
 								 worker_proc)));
-		MtmOnNodeDisconnect(nodeId);
+		/* MtmOnNodeDisconnect(nodeId); */
 		proc_exit(1);
 	}
 	PQclear(res);
@@ -408,7 +408,7 @@ pglogical_receiver_main(Datum main_arg)
 				{
 					ereport(LOG, (errmsg("%s: streaming header too small: %d",
 										 worker_proc, rc)));
-					MtmOnNodeDisconnect(nodeId);
+					/* MtmOnNodeDisconnect(nodeId); */
 					proc_exit(1);
 				}
 				replyRequested = copybuf[pos];
@@ -429,7 +429,7 @@ pglogical_receiver_main(Datum main_arg)
 
 					/* Leave is feedback is not sent properly */
 					if (!sendFeedback(conn, now, nodeId)) {
-						MtmOnNodeDisconnect(nodeId);
+						/* MtmOnNodeDisconnect(nodeId); */
 						proc_exit(1);
 					}
 				}
@@ -439,7 +439,7 @@ pglogical_receiver_main(Datum main_arg)
 			{
 				ereport(LOG, (errmsg("%s: Incorrect streaming header",
 									 worker_proc)));
-				MtmOnNodeDisconnect(nodeId);
+				/* MtmOnNodeDisconnect(nodeId); */
 				proc_exit(1);
 			}
 
@@ -548,7 +548,7 @@ pglogical_receiver_main(Datum main_arg)
 			{
 				ereport(LOG, (errmsg("%s: Incorrect status received... Leaving.",
 									 worker_proc)));
-				MtmOnNodeDisconnect(nodeId);
+				/* MtmOnNodeDisconnect(nodeId); */
 				proc_exit(1);
 			}
 
@@ -557,7 +557,7 @@ pglogical_receiver_main(Datum main_arg)
 			{
 				ereport(LOG, (errmsg("%s: Data remaining on the socket... Leaving.",
 									 worker_proc)));
-				MtmOnNodeDisconnect(nodeId);
+				/* MtmOnNodeDisconnect(nodeId); */
 				proc_exit(1);
 			}
 			continue;
@@ -576,7 +576,7 @@ pglogical_receiver_main(Datum main_arg)
 		{
 			ereport(LOG, (errmsg("%s: Failure while receiving changes...",
 								 worker_proc)));
-			MtmOnNodeDisconnect(nodeId);
+			/* MtmOnNodeDisconnect(nodeId); */
 			proc_exit(1);
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -401,7 +401,7 @@ static int MtmConnectSocket(char const* host, int port, int max_attempts)`
`401`	`401`
`402`	`402`	`/* Some node considered that I am dead, so switch to recovery mode */`
`403`	`403`	`if (BIT_CHECK(resp.disabledNodeMask, MtmNodeId-1)) {`
`404`		`- elog(WARNING, "Node %d think that I am dead", resp.node);`
	`404`	`+ elog(WARNING, "Node %d thinks that I was dead", resp.node);`
`405`	`405`	`BIT_SET(Mtm->disabledNodeMask, MtmNodeId-1);`
`406`	`406`	`MtmSwitchClusterMode(MTM_RECOVERY);`
`407`	`407`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2146,7 +2146,7 @@ MtmOnProcExit(int code, Datum arg)`
`2146`	`2146`	`if (MtmReplicationNodeId > 0) {`
`2147`	`2147`	`Mtm->nodes[MtmReplicationNodeId-1].senderPid = -1;`
`2148`	`2148`	`MTM_LOG1("WAL-sender to %d is terminated", MtmReplicationNodeId);`
`2149`		`- MtmOnNodeDisconnect(MtmReplicationNodeId);`
	`2149`	`+ /* MtmOnNodeDisconnect(MtmReplicationNodeId); */`
`2150`	`2150`	`}`
`2151`	`2151`	`}`
`2152`	`2152`
`@@ -2242,7 +2242,7 @@ MtmReplicationShutdownHook(struct PGLogicalShutdownHookArgs* args)`
`2242`	`2242`	`{`
`2243`	`2243`	`if (MtmReplicationNodeId >= 0) {`
`2244`	`2244`	`MTM_LOG1("Logical replication to node %d is stopped", MtmReplicationNodeId);`
`2245`		`- MtmOnNodeDisconnect(MtmReplicationNodeId);`
	`2245`	`+ /* MtmOnNodeDisconnect(MtmReplicationNodeId); */`
`2246`	`2246`	`MtmReplicationNodeId = -1; /* defuse on_proc_exit hook */`
`2247`	`2247`	`}`
`2248`	`2248`	`}`
Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ pglogical_receiver_main(Datum main_arg)`
`275`	`275`	`PQclear(res);`
`276`	`276`	`ereport(ERROR, (errmsg("%s: Could not create logical slot",`
`277`	`277`	`worker_proc)));`
`278`		`- MtmOnNodeDisconnect(nodeId);`
	`278`	`+ /* MtmOnNodeDisconnect(nodeId); */`
`279`	`279`	`proc_exit(1);`
`280`	`280`	`}`
`281`	`281`	`}`
`@@ -317,7 +317,7 @@ pglogical_receiver_main(Datum main_arg)`
`317`	`317`	`PQclear(res);`
`318`	`318`	`ereport(WARNING, (errmsg("%s: Could not start logical replication",`
`319`	`319`	`worker_proc)));`
`320`		`- MtmOnNodeDisconnect(nodeId);`
	`320`	`+ /* MtmOnNodeDisconnect(nodeId); */`
`321`	`321`	`proc_exit(1);`
`322`	`322`	`}`
`323`	`323`	`PQclear(res);`
`@@ -408,7 +408,7 @@ pglogical_receiver_main(Datum main_arg)`
`408`	`408`	`{`
`409`	`409`	`ereport(LOG, (errmsg("%s: streaming header too small: %d",`
`410`	`410`	`worker_proc, rc)));`
`411`		`- MtmOnNodeDisconnect(nodeId);`
	`411`	`+ /* MtmOnNodeDisconnect(nodeId); */`
`412`	`412`	`proc_exit(1);`
`413`	`413`	`}`
`414`	`414`	`replyRequested = copybuf[pos];`
`@@ -429,7 +429,7 @@ pglogical_receiver_main(Datum main_arg)`
`429`	`429`
`430`	`430`	`/* Leave is feedback is not sent properly */`
`431`	`431`	`if (!sendFeedback(conn, now, nodeId)) {`
`432`		`- MtmOnNodeDisconnect(nodeId);`
	`432`	`+ /* MtmOnNodeDisconnect(nodeId); */`
`433`	`433`	`proc_exit(1);`
`434`	`434`	`}`
`435`	`435`	`}`
`@@ -439,7 +439,7 @@ pglogical_receiver_main(Datum main_arg)`
`439`	`439`	`{`
`440`	`440`	`ereport(LOG, (errmsg("%s: Incorrect streaming header",`
`441`	`441`	`worker_proc)));`
`442`		`- MtmOnNodeDisconnect(nodeId);`
	`442`	`+ /* MtmOnNodeDisconnect(nodeId); */`
`443`	`443`	`proc_exit(1);`
`444`	`444`	`}`
`445`	`445`
`@@ -548,7 +548,7 @@ pglogical_receiver_main(Datum main_arg)`
`548`	`548`	`{`
`549`	`549`	`ereport(LOG, (errmsg("%s: Incorrect status received... Leaving.",`
`550`	`550`	`worker_proc)));`
`551`		`- MtmOnNodeDisconnect(nodeId);`
	`551`	`+ /* MtmOnNodeDisconnect(nodeId); */`
`552`	`552`	`proc_exit(1);`
`553`	`553`	`}`
`554`	`554`
`@@ -557,7 +557,7 @@ pglogical_receiver_main(Datum main_arg)`
`557`	`557`	`{`
`558`	`558`	`ereport(LOG, (errmsg("%s: Data remaining on the socket... Leaving.",`
`559`	`559`	`worker_proc)));`
`560`		`- MtmOnNodeDisconnect(nodeId);`
	`560`	`+ /* MtmOnNodeDisconnect(nodeId); */`
`561`	`561`	`proc_exit(1);`
`562`	`562`	`}`
`563`	`563`	`continue;`
`@@ -576,7 +576,7 @@ pglogical_receiver_main(Datum main_arg)`
`576`	`576`	`{`
`577`	`577`	`ereport(LOG, (errmsg("%s: Failure while receiving changes...",`
`578`	`578`	`worker_proc)));`
`579`		`- MtmOnNodeDisconnect(nodeId);`
	`579`	`+ /* MtmOnNodeDisconnect(nodeId); */`
`580`	`580`	`proc_exit(1);`
`581`	`581`	`}`
`582`	`582`	`}`