Commit0124e8e

committed

Maintain clique during major mode, but do not perform any actions based on that (like self-disabling)

1 parent5e1d416 commit0124e8eCopy full SHA for 0124e8e

File tree

+13

-6

lines changed

+13

-6

lines changed

Lines changed: 13 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -324,6 +324,7 @@ void MtmOnNodeDisconnect(int nodeId)`
`324`	`324`	`// MtmRefreshClusterStatus();`
`325`	`325`	`}`
`326`	`326`
	`327`	`+// XXXX: make that event too`
`327`	`328`	`voidMtmOnNodeConnect(intnodeId)`
`328`	`329`	`{`
`329`	`330`	`// if (!BIT_CHECK(SELF_CONNECTIVITY_MASK, nodeId-1))`
`@@ -451,12 +452,6 @@ MtmRefreshClusterStatus()`
`451`	`452`	`}`
`452`	`453`	`}`
`453`	`454`
`454`		`-/*`
`455`		`- * Do not check clique with referee grant, because we can disable ourself.`
`456`		`- */`
`457`		`-if (Mtm->refereeGrant)`
`458`		`-return;`
`459`		`-`
`460`	`455`	`/*`
`461`	`456`	`* Check for clique.`
`462`	`457`	`*/`
`@@ -500,6 +495,18 @@ MtmRefreshClusterStatus()`
`500`	`495`
`501`	`496`	`Mtm->clique=newClique;`
`502`	`497`
	`498`	`+/*`
	`499`	`+ * Do not perform any action based on clique with referee grant,`
	`500`	`+ * because we can disable ourself.`
	`501`	`+ * But we also need to maintain actual clique not disable ourselves`
	`502`	`+ * when neighbour node will come back and we erase refereeGrant.`
	`503`	`+ */`
	`504`	`+if (Mtm->refereeGrant)`
	`505`	`+{`
	`506`	`+MtmUnlock();`
	`507`	`+return;`
	`508`	`+}`
	`509`	`+`
`503`	`510`	`for (i=0;i<Mtm->nAllNodes;i++)`
`504`	`511`	`{`
`505`	`512`	`boolold_status=BIT_CHECK(Mtm->disabledNodeMask,i);`

Comments

(0)