Accept abort transaction at prepare stage

knizhnik · knizhnik · commit 3a8bfdd331d5 · 2016-05-14T18:56:05.000+03:00
diff --git a/contrib/mmts/arbiter.c b/contrib/mmts/arbiter.c
@@ -776,17 +776,23 @@ static void MtmTransReceiver(Datum arg)
 							}
 							break;
 						  case MSG_PREPARED:
-							Assert(ts->status == TRANSACTION_STATUS_IN_PROGRESS);
-							Assert(ts->nVotes < Mtm->nLiveNodes);
-							if (msg->csn > ts->csn) {
-								ts->csn = msg->csn;
-								MtmSyncClock(ts->csn);
-							}
-							if (++ts->nVotes == Mtm->nLiveNodes) {
-								ts->csn = MtmAssignCSN();
-								ts->status = TRANSACTION_STATUS_UNKNOWN;
-								MtmWakeUpBackend(ts);
-							}
+						    if (ts->status != TRANSACTION_STATUS_ABORTED) { 
+								Assert(ts->status == TRANSACTION_STATUS_IN_PROGRESS);
+								Assert(ts->nVotes < Mtm->nLiveNodes);
+								if (msg->csn > ts->csn) {
+									ts->csn = msg->csn;
+									MtmSyncClock(ts->csn);
+								}
+								if (++ts->nVotes == Mtm->nLiveNodes) {
+									ts->csn = MtmAssignCSN();
+									ts->status = TRANSACTION_STATUS_UNKNOWN;
+									MtmWakeUpBackend(ts);
+								}
+							} else { 
+								if (++ts->nVotes == Mtm->nLiveNodes) {
+									MtmWakeUpBackend(ts);
+								}
+							}								
 							break;
 						  default:
 							Assert(false);
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -795,7 +795,7 @@ MtmPostPrepareTransaction(MtmCurrentTrans* x)
 		MtmResetTransaction(x);
 	} else { 
 		time_t transTimeout = Max(Mtm2PCMinTimeout, (ts->csn - ts->snapshot)*Mtm2PCPrepareRatio/100000); /* usec->msec and percents */ 
-		time_t timeout = transTimeout < MtmHeartbeatRecvTimeout ? transTimeout : MtmHeartbeatRecvTimeout;
+		time_t timeout = Min(transTimeout, MtmHeartbeatRecvTimeout);
 		timestamp_t deadline = MtmGetSystemTime() + MSEC_TO_USEC(transTimeout);
 		int result = 0;
 		int nConfigChanges = Mtm->nConfigChanges;
