Commit df016c66 authored May 04, 2011 by Sunil Mushran Committed by Joel Becker May 13, 2011

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

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 <sunil.mushran@oracle.com>
Signed-off-by: Joel Becker <jlbec@evilplan.org>

parent 10b3dd76

fs/ocfs2/dlm/dlmmaster.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2574,6 +2574,9 @@ static int dlm_migrate_lockres(struct dlm_ctxt *dlm,
	res->state &= ~DLM_LOCK_RES_MIGRATING;		res->state &= ~DLM_LOCK_RES_MIGRATING;
	wake = 1;		wake = 1;
	spin_unlock(&res->spinlock);		spin_unlock(&res->spinlock);
			if (dlm_is_host_down(ret))
			dlm_wait_for_node_death(dlm, target,
			DLM_NODE_DEATH_WAIT_MAX);
	goto leave;		goto leave;
	}		}