Merge branch 'master' of github.com:postgrespro/postgres_cluster

kvap · kvap · commit 0e8b1a80f32b · 2016-04-11T13:00:18.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -1077,7 +1077,7 @@ bool MtmRecoveryCaughtUp(int nodeId, XLogRecPtr slotLSN)
 				BIT_CLEAR(Mtm->nodeLockerMask, nodeId-1);
 				Mtm->nLockers -= 1;
 			} else { 
-				MTM_LOG1("%d: dode %d is caugth-up without locking cluster", MyProcPid, nodeId);	
+				MTM_LOG1("%d: node %d is caugth-up without locking cluster", MyProcPid, nodeId);	
 				/* We are lucky: caugth-up without locking cluster! */
 			}
 			BIT_CLEAR(Mtm->disabledNodeMask, nodeId-1);
diff --git a/contrib/mmts/pglogical_receiver.c b/contrib/mmts/pglogical_receiver.c
@@ -249,7 +249,7 @@ pglogical_receiver_main(Datum main_arg)
 		PQfinish(conn);
 		ereport(WARNING, (errmsg("%s: Could not establish connection to remote server",
 							 worker_proc)));
-		MtmOnNodeDisconnect(args->remote_node);
+		/* MtmOnNodeDisconnect(args->remote_node); */
 		proc_exit(1);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1077,7 +1077,7 @@ bool MtmRecoveryCaughtUp(int nodeId, XLogRecPtr slotLSN)`
`1077`	`1077`	`BIT_CLEAR(Mtm->nodeLockerMask, nodeId-1);`
`1078`	`1078`	`Mtm->nLockers -= 1;`
`1079`	`1079`	`} else {`
`1080`		`- MTM_LOG1("%d: dode %d is caugth-up without locking cluster", MyProcPid, nodeId);`
	`1080`	`+ MTM_LOG1("%d: node %d is caugth-up without locking cluster", MyProcPid, nodeId);`
`1081`	`1081`	`/* We are lucky: caugth-up without locking cluster! */`
`1082`	`1082`	`}`
`1083`	`1083`	`BIT_CLEAR(Mtm->disabledNodeMask, nodeId-1);`
Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ pglogical_receiver_main(Datum main_arg)`
`249`	`249`	`PQfinish(conn);`
`250`	`250`	`ereport(WARNING, (errmsg("%s: Could not establish connection to remote server",`
`251`	`251`	`worker_proc)));`
`252`		`- MtmOnNodeDisconnect(args->remote_node);`
	`252`	`+ /* MtmOnNodeDisconnect(args->remote_node); */`
`253`	`253`	`proc_exit(1);`
`254`	`254`	`}`
`255`	`255`