ocfs2/dlm: Target node death during resource migration leads to thread spin

Sunil Mushran · jlbec · commit df016c665b10 · 2011-05-13T11:27:30.000-07:00
During resource migration, if the target node were to die, the thread doing
the migration spins until the target node is not removed from the domain map.
This patch slows the spin by making the thread wait for the recovery to kick in.

Signed-off-by: Sunil Mushran &lt;sunil.mushran@oracle.com&gt;
Signed-off-by: Joel Becker &lt;jlbec@evilplan.org&gt;
diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
@@ -2574,6 +2574,9 @@ static int dlm_migrate_lockres(struct dlm_ctxt *dlm,
 		res->state &= ~DLM_LOCK_RES_MIGRATING;
 		wake = 1;
 		spin_unlock(&res->spinlock);
+		if (dlm_is_host_down(ret))
+			dlm_wait_for_node_death(dlm, target,
+						DLM_NODE_DEATH_WAIT_MAX);
 		goto leave;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -2574,6 +2574,9 @@ static int dlm_migrate_lockres(struct dlm_ctxt *dlm,`
`2574`	`2574`	`res->state &= ~DLM_LOCK_RES_MIGRATING;`
`2575`	`2575`	`wake = 1;`
`2576`	`2576`	`spin_unlock(&res->spinlock);`
	`2577`	`+ if (dlm_is_host_down(ret))`
	`2578`	`+ dlm_wait_for_node_death(dlm, target,`
	`2579`	`+ DLM_NODE_DEATH_WAIT_MAX);`
`2577`	`2580`	`goto leave;`
`2578`	`2581`	`}`
`2579`	`2582`