Commit945dc59

committed

Fix several places where error was thrown under exclusive mtm lock

1 parentb28da7f commit945dc59Copy full SHA for 945dc59

File tree

-1

lines changed

-1

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1500,6 +1500,7 @@ MtmEndTransaction(MtmCurrentTrans* x, bool commit)`
`1500`	`1500`	`if (!(ts->status==TRANSACTION_STATUS_UNKNOWN`
`1501`	`1501`	`\|\| (ts->status==TRANSACTION_STATUS_IN_PROGRESS&&Mtm->status==MTM_RECOVERY)))`
`1502`	`1502`	`{`
	`1503`	`+MtmUnlock();`
`1503`	`1504`	`MTM_ELOG(ERROR,"Attempt to commit %s transaction %s (%llu)",`
`1504`	`1505`	`MtmTxnStatusMnem[ts->status],ts->gid, (long64)ts->xid);`
`1505`	`1506`	`}`
`@@ -2128,7 +2129,7 @@ bool MtmIsRecoveredNode(int nodeId)`
`2128`	`2129`	`{`
`2129`	`2130`	`if (BIT_CHECK(Mtm->disabledNodeMask,nodeId-1)) {`
`2130`	`2131`	`if (!MtmIsRecoverySession) {`
`2131`		`-MTM_ELOG(ERROR,"Node %d is marked as disabled but is not in recovery mode",nodeId);`
	`2132`	`+MTM_ELOG(WARNING,"Node %d is marked as disabled but is not in recovery mode",nodeId);`
`2132`	`2133`	`}`
`2133`	`2134`	`return true;`
`2134`	`2135`	`}else {`
`@@ -2222,6 +2223,7 @@ MtmLockCluster(void)`
`2222`	`2223`	`}`
`2223`	`2224`	`MtmLock(LW_EXCLUSIVE);`
`2224`	`2225`	`if (BIT_CHECK(Mtm->originLockNodeMask,MtmNodeId-1)) {`
	`2226`	`+MtmUnlock();`
`2225`	`2227`	`elog(ERROR,"There is already pending exclusive lock");`
`2226`	`2228`	`}`
`2227`	`2229`	`BIT_SET(Mtm->originLockNodeMask,MtmNodeId-1);`

Comments

(0)