Check cluster configuration changes in wait 2PC loop

knizhnik · kelvich · commit d565586c43b3 · 2017-11-13T02:17:30.000+03:00
diff --git a/multimaster.c b/multimaster.c
@@ -909,8 +909,12 @@ MtmPostPrepareTransaction(MtmCurrentTrans* x)
 		int nConfigChanges = Mtm->nConfigChanges;
 
 		timestamp_t start = MtmGetSystemTime();	
-		/* wait votes from all nodes */
-		while (!ts->votingCompleted && Mtm->status == MTM_ONLINE && ts->status != TRANSACTION_STATUS_ABORTED && start + transTimeout >= MtmGetSystemTime()) 
+		/* Wait votes from all nodes until: */
+		while (!ts->votingCompleted                           /* all nodes voted */
+			   && nConfigChanges == Mtm->nConfigChanges       /* configarion is changed */
+			   && Mtm->status == MTM_ONLINE                   /* node is not online */
+			   && ts->status != TRANSACTION_STATUS_ABORTED    /* transaction is aborted */
+			   && start + transTimeout >= MtmGetSystemTime()) /* timeout is expired */
 		{
 			MtmUnlock();
 			MTM_TXTRACE(x, "PostPrepareTransaction WaitLatch Start");
@@ -921,14 +925,13 @@ MtmPostPrepareTransaction(MtmCurrentTrans* x)
 			} 
 			MtmLock(LW_SHARED);
 		}
-		if (!ts->votingCompleted) {  
-			if (ts->status != TRANSACTION_STATUS_ABORTED) { 
-				MtmAbortTransaction(ts);
+		if (ts->status != TRANSACTION_STATUS_ABORTED && (!ts->votingCompleted || nConfigChanges != Mtm->nConfigChanges)) {  
+			if (nConfigChanges != Mtm->nConfigChanges) {
+				elog(WARNING, "Transaction %d is aborted because cluster configuration is changed during commit", x->xid);
+			} else {
 				elog(WARNING, "Transaction %d is aborted because of %d msec timeout expiration, prepare time %d msec", x->xid, (int)transTimeout, (int)USEC_TO_MSEC(ts->csn - x->snapshot));
 			}
-		} else if (nConfigChanges != Mtm->nConfigChanges) {
 			MtmAbortTransaction(ts);
-			elog(WARNING, "Transaction %d is aborted because cluster configuration is changed during commit", x->xid);
 		}
 		x->status = ts->status;
 		MTM_LOG3("%d: Result of vote: %d", MyProcPid, ts->status);
@@ -2308,6 +2311,7 @@ void MtmReceiverStarted(int nodeId)
 		BIT_SET(Mtm->pglogicalNodeMask, nodeId-1);
 		if (BIT_CHECK(Mtm->disabledNodeMask, nodeId-1)) {
 			MtmEnableNode(nodeId);
+			MtmCheckQuorum();
 		}
 		if (++Mtm->nReceivers == Mtm->nLiveNodes-1) {
 			if (Mtm->status == MTM_CONNECTED) { 
diff --git a/pglogical_receiver.c b/pglogical_receiver.c
@@ -227,8 +227,8 @@ pglogical_receiver_main(Datum main_arg)
 
 	MtmCreateSpillDirectory(nodeId);
 
-	Mtm->nodes[nodeId-1].senderPid = MyProcPid;
-	Mtm->nodes[nodeId-1].senderStartTime = MtmGetSystemTime();
+	Mtm->nodes[nodeId-1].receiverPid = MyProcPid;
+	Mtm->nodes[nodeId-1].receiverStartTime = MtmGetSystemTime();
 
     sprintf(worker_proc, "mtm_pglogical_receiver_%d_%d", MtmNodeId, nodeId);
 
diff --git a/tests2/docker-entrypoint.sh b/tests2/docker-entrypoint.sh
@@ -88,7 +88,7 @@ if [ "$1" = 'postgres' ]; then
 			multimaster.conn_strings = '$CONNSTRS'
 			multimaster.heartbeat_recv_timeout = 1000
 			multimaster.heartbeat_send_timeout = 250
-			multimaster.twopc_min_timeout = 40000
+			multimaster.twopc_min_timeout = 5000
 		EOF
 
 		tail -n 20 $PGDATA/postgresql.conf
