@@ -801,7 +801,7 @@ MtmPrePrepareTransaction(MtmCurrentTrans* x)
801801timestamp_t now = MtmGetSystemTime ();
802802if (Mtm -> lastClusterStatusUpdate + MSEC_TO_USEC (MtmHeartbeatRecvTimeout )< now ) {
803803Mtm -> lastClusterStatusUpdate = now ;
804- MtmRefreshClusterStatus (true);
804+ MtmRefreshClusterStatus (true, 0 );
805805}
806806if (!IsBackgroundWorker && Mtm -> status != MTM_ONLINE ) {
807807/* Do not take in account bg-workers which are performing recovery */
@@ -1461,9 +1461,9 @@ MtmBuildConnectivityMatrix(nodemask_t* matrix, bool nowait)
14611461 * Build connectivity graph, find clique in it and extend disabledNodeMask by nodes not included in clique.
14621462 * This function returns false if current node is excluded from cluster, true otherwise
14631463 */
1464- bool MtmRefreshClusterStatus (bool nowait )
1464+ bool MtmRefreshClusterStatus (bool nowait , int testNodeId )
14651465{
1466- nodemask_t mask ,clique ,disabled ;
1466+ nodemask_t mask ,clique ,disabled , enabled ;
14671467nodemask_t matrix [MAX_NODES ];
14681468MtmTransState * ts ;
14691469int clique_size ;
@@ -1496,17 +1496,13 @@ bool MtmRefreshClusterStatus(bool nowait)
14961496MtmDisableNode (i + 1 );
14971497}
14981498}
1499- #if 0 /* Do not enable nodes here: them will be enabled after completion of recovery */
15001499enabled = clique & Mtm -> disabledNodeMask ;/* new enabled nodes mask */
1501- for (i = 0 ,mask = enabled ;mask != 0 ;i ++ ,mask >>=1 ) {
1502- if (mask & 1 ) {
1503- MtmEnableNode (i + 1 );
1504- }
1500+ if (testNodeId != 0 && BIT_CHECK (enabled ,testNodeId - 1 )) {
1501+ MtmEnableNode (testNodeId );
15051502}
1506- Mtm -> reconnectMask |=clique & Mtm -> disabledNodeMask ;/* new enabled nodes mask */
1507- #endif
1503+ //Mtm->reconnectMask |= clique & Mtm->disabledNodeMask; /* new enabled nodes mask */
15081504
1509- if (disabled ) {
1505+ if (disabled | enabled ) {
15101506MtmCheckQuorum ();
15111507}
15121508/* Interrupt voting for active transaction and abort them */
@@ -1622,7 +1618,7 @@ void MtmOnNodeDisconnect(int nodeId)
16221618}
16231619MtmUnlock ();
16241620}else {
1625- MtmRefreshClusterStatus (false);
1621+ MtmRefreshClusterStatus (false, 0 );
16261622 }
16271623}
16281624
@@ -2595,7 +2591,7 @@ MtmReplicationStartupHook(struct PGLogicalStartupHookArgs* args)
25952591MtmCheckQuorum ();
25962592}else {
25972593MtmUnlock ();
2598- MtmRefreshClusterStatus (true);
2594+ MtmRefreshClusterStatus (true, MtmReplicationNodeId );
25992595MtmLock (LW_SHARED );
26002596if (BIT_CHECK (Mtm -> disabledNodeMask ,MtmReplicationNodeId - 1 )) {
26012597MtmUnlock ();