return back votes filtering for disabled nodes; fix bug with tx filtering in JoinTransaction

kelvich · kelvich · commit f484245fbb28 · 2017-11-13T02:21:37.000+03:00
diff --git a/multimaster.c b/multimaster.c
@@ -1183,7 +1183,8 @@ void MtmPrecommitTransaction(char const* gid)
 				ts->status = TRANSACTION_STATUS_UNKNOWN;
 				ts->csn = MtmAssignCSN();
 				MtmAdjustSubtransactions(ts);
-				MtmSend2PCMessage(ts, MSG_PRECOMMITTED);
+				if (Mtm->status != MTM_RECOVERY) // XXXX why?
+					MtmSend2PCMessage(ts, MSG_PRECOMMITTED);
 				MtmUnlock();
 				Assert(replorigin_session_origin != InvalidRepOriginId);
 				if (!IsTransactionState()) {
@@ -1627,10 +1628,13 @@ void MtmSend2PCMessage(MtmTransState* ts, MtmMessageCode cmd)
 	memcpy(msg.gid, ts->gid, MULTIMASTER_MAX_GID_SIZE);
 
 	Assert(!MtmIsCoordinator(ts));	/* All broadcasts are now done through logical decoding */
-	MTM_TXTRACE(ts, "MtmSend2PCMessage sending %s message to node %d", MtmMessageKindMnem[cmd], ts->gtid.node);
-	msg.node = ts->gtid.node;
-	msg.dxid = ts->gtid.xid;
-	MtmSendMessage(&msg);
+	if (!BIT_CHECK(Mtm->disabledNodeMask, ts->gtid.node-1))
+	{
+		MTM_TXTRACE(ts, "MtmSend2PCMessage sending %s message to node %d", MtmMessageKindMnem[cmd], ts->gtid.node);
+		msg.node = ts->gtid.node;
+		msg.dxid = ts->gtid.xid;
+		MtmSendMessage(&msg);
+	}
 }
 
 /*
@@ -1741,11 +1745,6 @@ void MtmJoinTransaction(GlobalTransactionId* gtid, csn_t globalSnapshot, nodemas
 	if (globalSnapshot != INVALID_CSN) {
 		MtmLock(LW_EXCLUSIVE);
 
-		if (BIT_CHECK(Mtm->disabledNodeMask, gtid->node-1)) {
-			MtmUnlock();
-			MTM_ELOG(ERROR, "Ignore transaction %llu from disabled node %d", (long64)gtid->xid, gtid->node);
-		}
-
 		liveMask = (((nodemask_t)1 << Mtm->nAllNodes) - 1) & ~Mtm->disabledNodeMask;
 		BIT_SET(participantsMask, gtid->node-1);
 		if (liveMask & ~participantsMask) {
