Fix several places where error was thrown under exclusive mtm lock

kelvich · kelvich · commit 52ee2e958acf · 2017-08-28T16:54:16.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -1489,6 +1489,7 @@ MtmEndTransaction(MtmCurrentTrans* x, bool commit)
 				if (!(ts->status == TRANSACTION_STATUS_UNKNOWN
 					  || (ts->status == TRANSACTION_STATUS_IN_PROGRESS && Mtm->status == MTM_RECOVERY)))
 				{
+					MtmUnlock();
 					MTM_ELOG(ERROR, "Attempt to commit %s transaction %s (%llu)",
 						 MtmTxnStatusMnem[ts->status], ts->gid, (long64)ts->xid);
 				}
@@ -2016,7 +2017,7 @@ bool MtmIsRecoveredNode(int nodeId)
 {
 	if (BIT_CHECK(Mtm->disabledNodeMask, nodeId-1)) {
 		if (!MtmIsRecoverySession) {
-			MTM_ELOG(ERROR, "Node %d is marked as disabled but is not in recovery mode", nodeId);
+			MTM_ELOG(WARNING, "Node %d is marked as disabled but is not in recovery mode", nodeId);
 		}
 		return true;
 	} else {
@@ -2087,6 +2088,7 @@ MtmLockCluster(void)
 	}
 	MtmLock(LW_EXCLUSIVE);
 	if (BIT_CHECK(Mtm->originLockNodeMask, MtmNodeId-1)) {
+		MtmUnlock();
 		elog(ERROR, "There is already pending exclusive lock");
 	}
 	BIT_SET(Mtm->originLockNodeMask, MtmNodeId-1);

Original file line number	Diff line number	Diff line change
`@@ -1489,6 +1489,7 @@ MtmEndTransaction(MtmCurrentTrans* x, bool commit)`
`1489`	`1489`	`if (!(ts->status == TRANSACTION_STATUS_UNKNOWN`
`1490`	`1490`	`\|\| (ts->status == TRANSACTION_STATUS_IN_PROGRESS && Mtm->status == MTM_RECOVERY)))`
`1491`	`1491`	`{`
	`1492`	`+ MtmUnlock();`
`1492`	`1493`	`MTM_ELOG(ERROR, "Attempt to commit %s transaction %s (%llu)",`
`1493`	`1494`	`MtmTxnStatusMnem[ts->status], ts->gid, (long64)ts->xid);`
`1494`	`1495`	`}`
`@@ -2016,7 +2017,7 @@ bool MtmIsRecoveredNode(int nodeId)`
`2016`	`2017`	`{`
`2017`	`2018`	`if (BIT_CHECK(Mtm->disabledNodeMask, nodeId-1)) {`
`2018`	`2019`	`if (!MtmIsRecoverySession) {`
`2019`		`- MTM_ELOG(ERROR, "Node %d is marked as disabled but is not in recovery mode", nodeId);`
	`2020`	`+ MTM_ELOG(WARNING, "Node %d is marked as disabled but is not in recovery mode", nodeId);`
`2020`	`2021`	`}`
`2021`	`2022`	`return true;`
`2022`	`2023`	`} else {`
`@@ -2087,6 +2088,7 @@ MtmLockCluster(void)`
`2087`	`2088`	`}`
`2088`	`2089`	`MtmLock(LW_EXCLUSIVE);`
`2089`	`2090`	`if (BIT_CHECK(Mtm->originLockNodeMask, MtmNodeId-1)) {`
	`2091`	`+ MtmUnlock();`
`2090`	`2092`	`elog(ERROR, "There is already pending exclusive lock");`
`2091`	`2093`	`}`
`2092`	`2094`	`BIT_SET(Mtm->originLockNodeMask, MtmNodeId-1);`