Check for heartbeat in raftable_set

knizhnik · kelvich · commit 63d44929474c · 2017-11-13T00:17:08.000+03:00
diff --git a/arbiter.c b/arbiter.c
@@ -112,8 +112,6 @@ static int         busy_socket;
 static void MtmTransSender(Datum arg);
 static void MtmTransReceiver(Datum arg);
 static void MtmSendHeartbeat(void);
-static void MtmCheckHeartbeat(void);
-
 
 
 static char const* const messageText[] = 
@@ -356,7 +354,7 @@ static void MtmSendHeartbeat()
 	
 }
 
-static void MtmCheckHeartbeat()
+void MtmCheckHeartbeat()
 {
 	if (send_heartbeat) {
 		send_heartbeat = false;
diff --git a/multimaster.c b/multimaster.c
@@ -795,8 +795,8 @@ void MtmWatchdog(void)
 			if (Mtm->nodes[i].lastHeartbeat != 0
 				&& now > Mtm->nodes[i].lastHeartbeat + MSEC_TO_USEC(MtmHeartbeatRecvTimeout)) 
 			{ 
-				elog(WARNING, "Disable node %d because last heartbeat was received %d msec ago (%ld)", 
-					 i+1, (int)USEC_TO_MSEC(now - Mtm->nodes[i].lastHeartbeat), USEC_TO_MSEC(now));
+				elog(WARNING, "Heartbeat was received from node %d during %d msec", 
+					 i+1, (int)USEC_TO_MSEC(now - Mtm->nodes[i].lastHeartbeat));
 				MtmOnNodeDisconnect(i+1);				
 			}
 		}
@@ -839,24 +839,20 @@ MtmPostPrepareTransaction(MtmCurrentTrans* x)
 
 		timestamp_t start = MtmGetSystemTime();	
 		/* wait votes from all nodes */
-		while (!ts->votingCompleted && start + transTimeout >= MtmGetSystemTime()) 
+		while (!ts->votingCompleted && ts->status != TRANSACTION_STATUS_ABORTED && start + transTimeout >= MtmGetSystemTime()) 
 		{
 			MtmUnlock();
-			MtmWatchdog();
-			if (ts->status == TRANSACTION_STATUS_ABORTED) {
-				elog(WARNING, "Transaction %d(%s) is aborted by watchdog", x->xid, x->gid);				
-				x->status = TRANSACTION_STATUS_ABORTED;
-				return;
-			}
 			result = WaitLatch(&MyProc->procLatch, WL_LATCH_SET|WL_TIMEOUT, MtmHeartbeatRecvTimeout);
 			if (result & WL_LATCH_SET) { 
 				ResetLatch(&MyProc->procLatch);			
 			} 
 			MtmLock(LW_SHARED);
 		}
-		if (!ts->votingCompleted) { 
-			MtmAbortTransaction(ts);
-			elog(WARNING, "Transaction is aborted because of %d msec timeout expiration, prepare time %d msec", (int)transTimeout, (int)USEC_TO_MSEC(ts->csn - x->snapshot));
+		if (!ts->votingCompleted) {  
+			if (ts->status != TRANSACTION_STATUS_ABORTED) { 
+				MtmAbortTransaction(ts);
+				elog(WARNING, "Transaction is aborted because of %d msec timeout expiration, prepare time %d msec", (int)transTimeout, (int)USEC_TO_MSEC(ts->csn - x->snapshot));
+			}
 		} else if (nConfigChanges != Mtm->nConfigChanges) {
 			MtmAbortTransaction(ts);
 			elog(WARNING, "Transaction is aborted because cluster configuration is changed during commit");
@@ -1435,7 +1431,7 @@ void MtmOnNodeDisconnect(int nodeId)
 	BIT_SET(Mtm->reconnectMask, nodeId-1);
 	MtmUnlock();
 
-	RaftableSet(psprintf("node-mask-%d", MtmNodeId), &Mtm->connectivityMask, sizeof Mtm->connectivityMask, true); /* false); -- TODO: raftable is hanged with nowait=true */
+	RaftableSet(psprintf("node-mask-%d", MtmNodeId), &Mtm->connectivityMask, sizeof Mtm->connectivityMask, false);
 
 	MtmSleep(MSEC_TO_USEC(MtmHeartbeatSendTimeout));
 
@@ -1469,7 +1465,7 @@ void MtmOnNodeConnect(int nodeId)
 	MtmUnlock();
 
 	MTM_LOG1("Reconnect node %d", nodeId);
-	RaftableSet(psprintf("node-mask-%d", MtmNodeId), &Mtm->connectivityMask, sizeof Mtm->connectivityMask, true); /* false); -- TODO: raftable is hanged with nowait=true */
+	RaftableSet(psprintf("node-mask-%d", MtmNodeId), &Mtm->connectivityMask, sizeof Mtm->connectivityMask, false); 
 }
 
 
diff --git a/multimaster.h b/multimaster.h
@@ -5,6 +5,7 @@
 #include "bgwpool.h"
 #include "bkb.h"
 
+#include "access/clog.h"
 #include "pglogical_output/hooks.h"
 
 #define  DEBUG_LEVEL 0
@@ -268,6 +269,8 @@ extern void  MtmHandleApplyError(void);
 extern void  MtmUpdateLsnMapping(int nodeId, XLogRecPtr endLsn);
 extern XLogRecPtr MtmGetFlushPosition(int nodeId);
 extern void MtmWatchdog(void);
+extern void MtmCheckHeartbeat(void);
+
 
 
 #endif
diff --git a/raftable.c b/raftable.c
@@ -2,7 +2,7 @@
 #include "postgres.h"
 #include "raftable.h"
 #include "raftable_wrapper.h"
-
+#include "multimaster.h"
 
 /*
  * Raftable function proxies
@@ -18,8 +18,14 @@ void* RaftableGet(char const* key, size_t* size, RaftableTimestamp* ts, bool now
 
 void RaftableSet(char const* key, void const* value, size_t size, bool nowait)
 {
-	if (MtmUseRaftable) { 
-		raftable_set(key, value, size, nowait ? 0 : -1);
+	if (MtmUseRaftable) {
+		if (nowait) {
+			raftable_set(key, value, size, 0);
+		} else { 
+			while (!raftable_set(key, value, size, MtmHeartbeatSendTimeout)) { 
+				MtmCheckHeartbeat();
+			}
+		}
 	}		
 }
 

Original file line number	Diff line number	Diff line change
`@@ -112,8 +112,6 @@ static int busy_socket;`
`112`	`112`	`static void MtmTransSender(Datum arg);`
`113`	`113`	`static void MtmTransReceiver(Datum arg);`
`114`	`114`	`static void MtmSendHeartbeat(void);`
`115`		`-static void MtmCheckHeartbeat(void);`
`116`		`-`
`117`	`115`
`118`	`116`
`119`	`117`	`static char const* const messageText[] =`
`@@ -356,7 +354,7 @@ static void MtmSendHeartbeat()`
`356`	`354`
`357`	`355`	`}`
`358`	`356`
`359`		`-static void MtmCheckHeartbeat()`
	`357`	`+void MtmCheckHeartbeat()`
`360`	`358`	`{`
`361`	`359`	`if (send_heartbeat) {`
`362`	`360`	`send_heartbeat = false;`