commit recovered prepared tx that were produced by a sible major

kelvich · kelvich · commit c3b857a36241 · 2017-11-13T02:23:42.000+03:00
diff --git a/multimaster.c b/multimaster.c
@@ -1687,7 +1687,19 @@ void MtmSend2PCMessage(MtmTransState* ts, MtmMessageCode cmd)
 static void MtmBroadcastPollMessage(MtmTransState* ts)
 {
 	int i;
+	int nparts;
 	MtmArbiterMessage msg;
+
+	nparts = Mtm->nAllNodes - countZeroBits(ts->participantsMask, Mtm->nAllNodes);
+	MTM_LOG1("MtmBroadcastPollMessage: %s %lld %d", ts->gid, ts->participantsMask, nparts);
+
+	if (nparts == 1)
+	{
+		/* we were in major mode and there nobody to ask about status */
+		MtmFinishPreparedTransaction(ts, true);
+		return;
+	}
+
 	MtmInitMessage(&msg, MSG_POLL_REQUEST);
 	memcpy(msg.gid, ts->gid, MULTIMASTER_MAX_GID_SIZE);
 	ts->votedMask = 0;
diff --git a/state.c b/state.c
@@ -41,7 +41,7 @@ maskToString(nodemask_t mask, int nNodes)
 	return strMask;
 }
 
-static int
+int
 countZeroBits(nodemask_t mask, int nNodes)
 {
 	int i, count = 0;
diff --git a/state.h b/state.h
@@ -31,3 +31,5 @@ extern void MtmOnNodeConnect(int nodeId);
 extern void MtmReconnectNode(int nodeId);
 
 extern void MtmRefreshClusterStatus(void);
+
+extern int countZeroBits(nodemask_t mask, int nNodes);

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ maskToString(nodemask_t mask, int nNodes)`
`41`	`41`	`return strMask;`
`42`	`42`	`}`
`43`	`43`
`44`		`-static int`
	`44`	`+int`
`45`	`45`	`countZeroBits(nodemask_t mask, int nNodes)`
`46`	`46`	`{`
`47`	`47`	`int i, count = 0;`