Commit 4b77f2c9 authored Nov 01, 2006 by David Teigland Committed by Steven Whitehouse Nov 30, 2006

[DLM] do full recover_locks barrier



Red Hat BZ 211914

The previous patch "[DLM] fix aborted recovery during
node removal" was incomplete as discovered with further testing.  It set
the bit for the RS_LOCKS barrier but did not then wait for the barrier.
This is often ok, but sometimes it will cause yet another recovery hang.
If it's a new node that also has the lowest nodeid that skips the barrier
wait, then it misses the important step of collecting and reporting the
barrier status from the other nodes (which is the job of the low nodeid in
the barrier wait routine).

Signed-off-by: David Teigland <teigland@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

parent 2cdc98aa

fs/dlm/recoverd.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -168,9 +168,15 @@ static int ls_recover(struct dlm_ls ls, struct dlm_recover rv)
		/*
		* Other lockspace members may be going through the "neg" steps
		* while also adding us to the lockspace, in which case they'll
		* be looking for this status bit during dlm_recover_locks().
		* be doing the recover_locks (RS_LOCKS) barrier.
		*/
		dlm_set_recover_status(ls, DLM_RS_LOCKS);

		error = dlm_recover_locks_wait(ls);
		if (error) {
		log_error(ls, "recover_locks_wait failed %d", error);
		goto fail;
		}
		}

		dlm_release_root_list(ls);

Admin message