Accurartly decrement Mtm->nActiveTransactions

knizhnik · knizhnik · commit e494d0c08174 · 2016-06-21T15:08:55.000+03:00
diff --git a/contrib/mmts/arbiter.c b/contrib/mmts/arbiter.c
@@ -341,8 +341,10 @@ static void MtmSendHeartbeat()
 	{
 		if (sockets[i] >= 0 && sockets[i] != busy_socket && !BIT_CHECK(Mtm->disabledNodeMask|Mtm->reconnectMask, i))
 		{ 
-			int rc = send(sockets[i], &msg, sizeof(msg), 0);
-			Assert(rc <= 0 || (size_t)rc == sizeof(msg));
+			size_t rc = send(sockets[i], &msg, sizeof(msg), 0);
+			if ((size_t)rc != sizeof(msg)) { 
+				elog(LOG, "Failed to send heartbeat to node %d: %d", i, errno);
+			}
 		}
 	}
 	
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -858,10 +858,10 @@ MtmPostPrepareTransaction(MtmCurrentTrans* x)
 			MtmLock(LW_SHARED);
 		}
 		if (!ts->votingCompleted) { 
-			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) {
-			ts->status = TRANSACTION_STATUS_ABORTED;
+			MtmAbortTransaction(ts);
 			elog(WARNING, "Transaction is aborted because cluster configuration is changed during commit");
 		}
 		x->status = ts->status;
@@ -918,12 +918,12 @@ MtmEndTransaction(MtmCurrentTrans* x, bool commit)
 				}
 				Mtm->lastCsn = ts->csn;
 				ts->status = TRANSACTION_STATUS_COMMITTED;
+				MtmAdjustSubtransactions(ts);
+				Assert(Mtm->nActiveTransactions != 0);
+				Mtm->nActiveTransactions -= 1;
 			} else { 
-				ts->status = TRANSACTION_STATUS_ABORTED;
+				MtmAbortTransaction(ts);
 			}
-			MtmAdjustSubtransactions(ts);
-			Assert(Mtm->nActiveTransactions != 0);
-			Mtm->nActiveTransactions -= 1;
 		}
 		if (!commit && x->isReplicated && TransactionIdIsValid(x->gtid.xid)) { 
 			Assert(Mtm->status != MTM_RECOVERY);
@@ -1067,9 +1067,11 @@ void MtmWakeUpBackend(MtmTransState* ts)
 
 void MtmAbortTransaction(MtmTransState* ts)
 {	
-	ts->status = TRANSACTION_STATUS_ABORTED;
-	MtmAdjustSubtransactions(ts);
-	Mtm->nActiveTransactions -= 1;
+	if (ts->status != TRANSACTION_STATUS_ABORTED) { 
+		ts->status = TRANSACTION_STATUS_ABORTED;
+		MtmAdjustSubtransactions(ts);
+		Mtm->nActiveTransactions -= 1;
+	}
 }
 
 /*
@@ -1343,8 +1345,8 @@ bool MtmRefreshClusterStatus(bool nowait)
 {
 	nodemask_t mask, clique;
 	nodemask_t matrix[MAX_NODES];
-	int clique_size;
 	MtmTransState *ts;
+	int clique_size;
 	int i;
 
 	if (!MtmUseRaftable || !MtmBuildConnectivityMatrix(matrix, nowait)) { 

Original file line number	Diff line number	Diff line change
`@@ -341,8 +341,10 @@ static void MtmSendHeartbeat()`
`341`	`341`	`{`
`342`	`342`	`if (sockets[i] >= 0 && sockets[i] != busy_socket && !BIT_CHECK(Mtm->disabledNodeMask\|Mtm->reconnectMask, i))`
`343`	`343`	`{`
`344`		`- int rc = send(sockets[i], &msg, sizeof(msg), 0);`
`345`		`- Assert(rc <= 0 \|\| (size_t)rc == sizeof(msg));`
	`344`	`+ size_t rc = send(sockets[i], &msg, sizeof(msg), 0);`
	`345`	`+ if ((size_t)rc != sizeof(msg)) {`
	`346`	`+ elog(LOG, "Failed to send heartbeat to node %d: %d", i, errno);`
	`347`	`+ }`
`346`	`348`	`}`
`347`	`349`	`}`
`348`	`350`