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

Author: kelvich

contrib/mmts/multimaster.c

@@ -737,9 +737,13 @@ MtmPrePrepareTransaction(MtmCurrentTrans* x)
 	Assert(TransactionIdIsValid(x->xid));
 
 	if (Mtm->disabledNodeMask != 0) { 
-		MtmRefreshClusterStatus(true);
+		timestamp_t now = MtmGetSystemTime();		
+		if (Mtm->lastClusterStatusUpdate + MSEC_TO_USEC(MtmRaftPollDelay) < now) { 
+			Mtm->lastClusterStatusUpdate = now;
+			MtmRefreshClusterStatus(true);
+		}
 		if (!IsBackgroundWorker && Mtm->status != MTM_ONLINE) { 
-			/* Do not take in accoutn bg-workers which are performing recovery */
+			/* Do not take in account bg-workers which are performing recovery */
 			elog(ERROR, "Abort current transaction because this cluster node is in %s status", MtmNodeStatusMnem[Mtm->status]);			
 		}
 	}
@@ -835,8 +839,10 @@ MtmPostPrepareTransaction(MtmCurrentTrans* x)
 		time_t transTimeout = Max(Mtm2PCMinTimeout, (ts->csn - ts->snapshot)*Mtm2PCPrepareRatio/100000); /* usec->msec and percents */ 
 		int result = 0;
 		int nConfigChanges = Mtm->nConfigChanges;
+
+		timestamp_t start = MtmGetSystemTime();	
 		/* wait votes from all nodes */
-		while (!ts->votingCompleted && !(result & WL_TIMEOUT)) 
+		while (!ts->votingCompleted && start + transTimeout >= MtmGetSystemTime()) 
 		{
 			MtmUnlock();
 			MtmWatchdog();
@@ -845,7 +851,7 @@ MtmPostPrepareTransaction(MtmCurrentTrans* x)
 				x->status = TRANSACTION_STATUS_ABORTED;
 				return;
 			}
-			result = WaitLatch(&MyProc->procLatch, WL_LATCH_SET|WL_TIMEOUT, transTimeout);
+			result = WaitLatch(&MyProc->procLatch, WL_LATCH_SET|WL_TIMEOUT, MtmHeartbeatRecvTimeout);
 			if (result & WL_LATCH_SET) { 
 				ResetLatch(&MyProc->procLatch);			
 			} 
@@ -1569,6 +1575,7 @@ static void MtmInitialize()
 		Mtm->recoverySlot = 0;
 		Mtm->locks = GetNamedLWLockTranche(MULTIMASTER_NAME);
 		Mtm->csn = MtmGetCurrentTime();
+		Mtm->lastClusterStatusUpdate = MtmGetSystemTime();
 		Mtm->lastCsn = INVALID_CSN;
 		Mtm->oldestXid = FirstNormalTransactionId;
         Mtm->nLiveNodes = MtmNodes;

contrib/mmts/multimaster.h

@@ -189,7 +189,8 @@ typedef struct
 								  		  This list is expected to be in CSN ascending order, by strict order may be violated */
 	uint64 transCount;                 /* Counter of transactions perfromed by this node */	
 	uint64 gcCount;                    /* Number of global transactions performed since last GC */
-    BgwPool pool;                      /* Pool of background workers for applying logical replication patches */
+    timestamp_t lastClusterStatusUpdate;/* Time of last update of cluster status */
+	BgwPool pool;                      /* Pool of background workers for applying logical replication patches */
 	MtmNodeInfo nodes[1];              /* [Mtm->nAllNodes]: per-node data */ 
 } MtmState;