@@ -736,9 +736,13 @@ MtmPrePrepareTransaction(MtmCurrentTrans* x)
736736Assert (TransactionIdIsValid (x -> xid ));
737737
738738if (Mtm -> disabledNodeMask != 0 ) {
739- MtmRefreshClusterStatus (true);
739+ timestamp_t now = MtmGetSystemTime ();
740+ if (Mtm -> lastClusterStatusUpdate + MSEC_TO_USEC (MtmRaftPollDelay )< now ) {
741+ Mtm -> lastClusterStatusUpdate = now ;
742+ MtmRefreshClusterStatus (true);
743+ }
740744if (!IsBackgroundWorker && Mtm -> status != MTM_ONLINE ) {
741- /* Do not take inaccoutn bg-workers which are performing recovery */
745+ /* Do not take inaccount bg-workers which are performing recovery */
742746elog (ERROR ,"Abort current transaction because this cluster node is in %s status" ,MtmNodeStatusMnem [Mtm -> status ]);
743747}
744748}
@@ -834,8 +838,10 @@ MtmPostPrepareTransaction(MtmCurrentTrans* x)
834838time_t transTimeout = Max (Mtm2PCMinTimeout , (ts -> csn - ts -> snapshot )* Mtm2PCPrepareRatio /100000 );/* usec->msec and percents */
835839int result = 0 ;
836840int nConfigChanges = Mtm -> nConfigChanges ;
841+
842+ timestamp_t start = MtmGetSystemTime ();
837843/* wait votes from all nodes */
838- while (!ts -> votingCompleted && !( result & WL_TIMEOUT ))
844+ while (!ts -> votingCompleted && start + transTimeout >= MtmGetSystemTime ( ))
839845{
840846MtmUnlock ();
841847MtmWatchdog ();
@@ -844,7 +850,7 @@ MtmPostPrepareTransaction(MtmCurrentTrans* x)
844850x -> status = TRANSACTION_STATUS_ABORTED ;
845851return ;
846852}
847- result = WaitLatch (& MyProc -> procLatch ,WL_LATCH_SET |WL_TIMEOUT ,transTimeout );
853+ result = WaitLatch (& MyProc -> procLatch ,WL_LATCH_SET |WL_TIMEOUT ,MtmHeartbeatRecvTimeout );
848854if (result & WL_LATCH_SET ) {
849855ResetLatch (& MyProc -> procLatch );
850856}
@@ -1568,6 +1574,7 @@ static void MtmInitialize()
15681574Mtm -> recoverySlot = 0 ;
15691575Mtm -> locks = GetNamedLWLockTranche (MULTIMASTER_NAME );
15701576Mtm -> csn = MtmGetCurrentTime ();
1577+ Mtm -> lastClusterStatusUpdate = MtmGetSystemTime ();
15711578Mtm -> lastCsn = INVALID_CSN ;
15721579Mtm -> oldestXid = FirstNormalTransactionId ;
15731580Mtm -> nLiveNodes = MtmNodes ;