Fix wrong assertion in MtmEndTransaction().

kelvich · kelvich · commit 8a957a435e1b · 2017-11-13T02:23:41.000+03:00
MtmBroadcastPollMessage() also happens when old prepared tx are
restored, but we are still in DISABLED mode. So it is legal
to finish in-progress transaction.
diff --git a/multimaster.c b/multimaster.c
@@ -1531,7 +1531,7 @@ MtmEndTransaction(MtmCurrentTrans* x, bool commit)
 						 (commit ? "commit" : "rollback"), ts->gid, ts->xid, ts->gtid.node, ts->gtid.xid, MtmTxnStatusMnem[ts->status]);
 			if (commit) {
 				if (!(ts->status == TRANSACTION_STATUS_UNKNOWN
-					  || (ts->status == TRANSACTION_STATUS_IN_PROGRESS && Mtm->status == MTM_RECOVERY)))
+					  || (ts->status == TRANSACTION_STATUS_IN_PROGRESS && Mtm->status <= MTM_RECOVERY)))
 				{
 					MtmUnlock();
 					MTM_ELOG(ERROR, "Attempt to commit %s transaction %s (%llu)",

Original file line number	Diff line number	Diff line change
`@@ -1531,7 +1531,7 @@ MtmEndTransaction(MtmCurrentTrans* x, bool commit)`
`1531`	`1531`	`(commit ? "commit" : "rollback"), ts->gid, ts->xid, ts->gtid.node, ts->gtid.xid, MtmTxnStatusMnem[ts->status]);`
`1532`	`1532`	`if (commit) {`
`1533`	`1533`	`if (!(ts->status == TRANSACTION_STATUS_UNKNOWN`
`1534`		`- \|\| (ts->status == TRANSACTION_STATUS_IN_PROGRESS && Mtm->status == MTM_RECOVERY)))`
	`1534`	`+ \|\| (ts->status == TRANSACTION_STATUS_IN_PROGRESS && Mtm->status <= MTM_RECOVERY)))`
`1535`	`1535`	`{`
`1536`	`1536`	`MtmUnlock();`
`1537`	`1537`	`MTM_ELOG(ERROR, "Attempt to commit %s transaction %s (%llu)",`