Commit1fdf868

committed

Return back error in MtmIsRecoveredNode() which was changed to warning in85c7597. Also introduce MtmDeepUnlock()

1 parent9ebee80 commit1fdf868Copy full SHA for 1fdf868

File tree

+17

-1

lines changed

+17

-1

lines changed

Lines changed: 16 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -395,6 +395,20 @@ void MtmUnlock(void)`
`395`	`395`	`LWLockRelease((LWLockId)&Mtm->locks[MTM_STATE_LOCK_ID]);`
`396`	`396`	`}`
`397`	`397`
	`398`	`+voidMtmDeepUnlock(void)`
	`399`	`+{`
	`400`	`+if (MtmLockCount>0)`
	`401`	`+Assert(Mtm->lastLockHolder==MyProcPid);`
	`402`	`+`
	`403`	`+/* If we have no PGPROC, then lock was not obtained. */`
	`404`	`+if (MyProc==NULL)`
	`405`	`+return;`
	`406`	`+`
	`407`	`+MtmLockCount=0;`
	`408`	`+Mtm->lastLockHolder=0;`
	`409`	`+LWLockRelease((LWLockId)&Mtm->locks[MTM_STATE_LOCK_ID]);`
	`410`	`+}`
	`411`	`+`
`398`	`412`	`voidMtmLockNode(intnodeId,LWLockModemode)`
`399`	`413`	`{`
`400`	`414`	`Assert(nodeId>0&&nodeId <=MtmMaxNodes*2);`
`@@ -2033,7 +2047,8 @@ bool MtmIsRecoveredNode(int nodeId)`
`2033`	`2047`	`{`
`2034`	`2048`	`if (BIT_CHECK(Mtm->disabledNodeMask,nodeId-1)) {`
`2035`	`2049`	`if (!MtmIsRecoverySession) {`
`2036`		`-MTM_ELOG(WARNING,"Node %d is marked as disabled but is not in recovery mode",nodeId);`
	`2050`	`+MtmDeepUnlock();`
	`2051`	`+MTM_ELOG(ERROR,"Node %d is marked as disabled but is not in recovery mode",nodeId);`
`2037`	`2052`	`}`
`2038`	`2053`	`return true;`
`2039`	`2054`	`}else {`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -399,6 +399,7 @@ extern void MtmSendMessage(MtmArbiterMessage* msg);`
`399`	`399`	`externvoidMtmAdjustSubtransactions(MtmTransState*ts);`
`400`	`400`	`externvoidMtmLock(LWLockModemode);`
`401`	`401`	`externvoidMtmUnlock(void);`
	`402`	`+externvoidMtmDeepUnlock(void);`
`402`	`403`	`externvoidMtmLockNode(intnodeId,LWLockModemode);`
`403`	`404`	`externboolMtmTryLockNode(intnodeId,LWLockModemode);`
`404`	`405`	`externvoidMtmUnlockNode(intnodeId);`

Comments

(0)