Handle PREPARE message for aborted transactions at slaves

knizhnik · knizhnik · commit 7c42a8665aee · 2016-06-23T18:06:45.000+03:00
diff --git a/contrib/mmts/arbiter.c b/contrib/mmts/arbiter.c
@@ -904,11 +904,15 @@ static void MtmTransReceiver(Datum arg)
 					} else { 
 						switch (msg->code) { 
 						  case MSG_PREPARE:
-							Assert(ts->status == TRANSACTION_STATUS_IN_PROGRESS); 	
-							ts->status = TRANSACTION_STATUS_UNKNOWN;
-							ts->csn = MtmAssignCSN();
-							MtmAdjustSubtransactions(ts);
-							MtmSendNotificationMessage(ts, MSG_PREPARED);
+							if (ts->status == TRANSACTION_STATUS_IN_PROGRESS) { 
+								ts->status = TRANSACTION_STATUS_UNKNOWN;
+								ts->csn = MtmAssignCSN();
+								MtmAdjustSubtransactions(ts);
+								MtmSendNotificationMessage(ts, MSG_PREPARED);
+							} else {
+								Assert(ts->status == TRANSACTION_STATUS_ABORTED);
+								MtmSendNotificationMessage(ts, MSG_ABORTED);
+							}
 							break;
 						  default:
 							Assert(false);
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -196,7 +196,6 @@ int   MtmReplicationNodeId;
 int   MtmArbiterPort;
 int   MtmConnectTimeout;
 int   MtmReconnectTimeout;
-int   MtmRaftPollDelay;
 int   MtmNodeDisableDelay;
 int   MtmTransSpillThreshold;
 int   MtmMaxNodes;
@@ -737,7 +736,7 @@ MtmPrePrepareTransaction(MtmCurrentTrans* x)
 
 	if (Mtm->disabledNodeMask != 0) { 
 		timestamp_t now = MtmGetSystemTime();		
-		if (Mtm->lastClusterStatusUpdate + MSEC_TO_USEC(MtmRaftPollDelay) < now) { 
+		if (Mtm->lastClusterStatusUpdate + MSEC_TO_USEC(MtmHeartbeatRecvTimeout) < now) { 
 			Mtm->lastClusterStatusUpdate = now;
 			MtmRefreshClusterStatus(true);
 		}
@@ -1439,7 +1438,7 @@ void MtmOnNodeDisconnect(int nodeId)
 
 	RaftableSet(psprintf("node-mask-%d", MtmNodeId), &Mtm->connectivityMask, sizeof Mtm->connectivityMask, true); /* false); -- TODO: raftable is hanged with nowait=true */
 
-	MtmSleep(MSEC_TO_USEC(MtmRaftPollDelay));
+	MtmSleep(MSEC_TO_USEC(MtmHeartbeatSendTimeout));
 
 	if (!MtmUseRaftable) 
 	{
@@ -2060,22 +2059,6 @@ _PG_init(void)
 		NULL
 	);
 
-	DefineCustomIntVariable(
-		"multimaster.raft_poll_delay",
-		"Multimaster delay of polling cluster state from Raftable after updating local node status",
-		"Timeout in milliseconds before polling state of nodes",
-		&MtmRaftPollDelay,
-		1000,
-		1,
-		INT_MAX,
-		PGC_BACKEND,
-		0,
-		NULL,
-		NULL,
-		NULL
-	);
-
-
 	MtmSplitConnStrs();
     MtmStartReceivers();
 		
