Fix reace condition in tw_pahse.c

Author: knizhnik

arbiter.c

@@ -371,7 +371,9 @@ static void MtmSendHeartbeat()
 				} else {
 					/* Connectivity mask can be cleared by MtmWatchdog: in this case sockets[i] >= 0 */
 					if (BIT_CHECK(Mtm->connectivityMask, i)) { 
-						MtmDisconnect(i);
+						close(sockets[i]);
+						sockets[i] = -1;
+						MtmReconnectNode(i+1);
 						//MtmOnNodeConnect(i+1);
 					}
 					MTM_LOG4("Send heartbeat to node %d with timestamp %ld", i+1, now);    

multimaster.c

@@ -2021,6 +2021,13 @@ void MtmOnNodeConnect(int nodeId)
 	MtmUnlock();
 }
 
+void MtmReconnectNode(int nodeId)
+{
+	MtmLock(LW_EXCLUSIVE);	
+	BIT_SET(Mtm->reconnectMask, nodeId-1);
+	MtmUnlock();
+}
+
 
 
 /*
@@ -3301,7 +3308,7 @@ bool MtmFilterTransaction(char* record, int size)
 	}
 
 	if (duplicate) {
-		MTM_LOG2("Ignore transaction %s from node %d flags=%x, our restartLSN for node: %lx,restart_lsn = (origin node %d == MtmReplicationNodeId %d) ? end_lsn=%lx, origin_lsn=%lx", 
+		MTM_LOG1("Ignore transaction %s from node %d flags=%x, our restartLSN for node: %lx,restart_lsn = (origin node %d == MtmReplicationNodeId %d) ? end_lsn=%lx, origin_lsn=%lx", 
 				 gid, replication_node, flags, Mtm->nodes[origin_node-1].restartLSN, origin_node, MtmReplicationNodeId, end_lsn, origin_lsn);
 	} else {
 		MTM_LOG2("Apply transaction %s from node %d lsn %lx, flags=%x, origin node %d, original lsn=%lx, current lsn=%lx", 

multimaster.h

@@ -358,6 +358,7 @@ extern void  MtmUnlock(void);
 extern void  MtmLockNode(int nodeId, LWLockMode mode);
 extern void  MtmUnlockNode(int nodeId);
 extern void  MtmDropNode(int nodeId, bool dropSlot);
+extern void  MtmReconnectNode(int nodeId);
 extern void  MtmRecoverNode(int nodeId);
 extern void  MtmOnNodeDisconnect(int nodeId);
 extern void  MtmOnNodeConnect(int nodeId);