Commit89ffc70

committed

Fix several places where error was thrown under exclusive mtm lock

1 parentb9226d0 commit89ffc70Copy full SHA for 89ffc70

File tree

-13

lines changed

-13

lines changed

Lines changed: 9 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -2029,19 +2029,15 @@ static int64 MtmGetSlotLag(int nodeId)`
`2029`	`2029`	`*/`
`2030`	`2030`	`boolMtmIsRecoveredNode(intnodeId)`
`2031`	`2031`	`{`
`2032`		`-if (!BIT_CHECK(Mtm->disabledNodeMask,nodeId-1))`
`2033`		`-Assert(!MtmIsRecoverySession);`
`2034`		`-`
`2035`		`-returnBIT_CHECK(Mtm->disabledNodeMask,nodeId-1)&&MtmIsRecoverySession;`
`2036`		`-// if (BIT_CHECK(Mtm->disabledNodeMask, nodeId-1)) {`
`2037`		`-// if (!MtmIsRecoverySession) {`
`2038`		`-// MTM_ELOG(WARNING, "Node %d is marked as disabled but is not in recovery mode", nodeId);`
`2039`		`-// }`
`2040`		`-// return true;`
`2041`		`-// } else {`
`2042`		`-// MtmIsRecoverySession = false; /* recovery is completed */`
`2043`		`-// return false;`
`2044`		`-// }`
	`2032`	`+if (BIT_CHECK(Mtm->disabledNodeMask,nodeId-1)) {`
	`2033`	`+if (!MtmIsRecoverySession) {`
	`2034`	`+MTM_ELOG(WARNING,"Node %d is marked as disabled but is not in recovery mode",nodeId);`
	`2035`	`+}`
	`2036`	`+return true;`
	`2037`	`+}else {`
	`2038`	`+MtmIsRecoverySession= false;/* recovery is completed */`
	`2039`	`+return false;`
	`2040`	`+}`
`2045`	`2041`	`}`
`2046`	`2042`
`2047`	`2043`	`/*`

Comments

(0)