diff options
| author |   Kurt Hackel <kurt.hackel@oracle.com> | 2006-01-18 17:05:38 -0800 |
|---|---|---|
| committer |   Mark Fasheh <mark.fasheh@oracle.com> | 2006-02-16 12:01:38 -0800 |
| commit | 44465a7daf7c4e34199b2b0ebb3c5101619dcb9d (patch) | |
| tree | ec10b2c1a93a41b16abeb1535c25944c628b447c /fs/ocfs2/dlm/dlmlock.c | |
| parent | [PATCH] ocfs2: fix release of ast never reserved (diff) | |
| download | linux-dev-44465a7daf7c4e34199b2b0ebb3c5101619dcb9d.tar.xz linux-dev-44465a7daf7c4e34199b2b0ebb3c5101619dcb9d.zip | |
[PATCH] ocfs2: add dlm_wait_for_node_death
* add dlm_wait_for_node_death function to be used after receiving a network
error. this will wait for the given timeout to allow the heartbeat
callbacks to update the domain map. without this, some paths may spin
and consume enough cpu that the heartbeat gets starved and never updates.
Signed-off-by: Kurt Hackel <kurt.hackel@oracle.com>
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs/ocfs2/dlm/dlmlock.c')
| -rw-r--r-- | fs/ocfs2/dlm/dlmlock.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/fs/ocfs2/dlm/dlmlock.c b/fs/ocfs2/dlm/dlmlock.c index d1a0038557a3..e709412e6e32 100644 --- a/fs/ocfs2/dlm/dlmlock.c +++ b/fs/ocfs2/dlm/dlmlock.c @@ -646,7 +646,19 @@ retry_lock: mlog(0, "retrying lock with migration/" "recovery/in progress\n"); msleep(100); - dlm_wait_for_recovery(dlm); + /* no waiting for dlm_reco_thread */ + if (recovery) { + if (status == DLM_RECOVERING) { + mlog(0, "%s: got RECOVERING " + "for $REOCVERY lock, master " + "was %u\n", dlm->name, + res->owner); + dlm_wait_for_node_death(dlm, res->owner, + DLM_NODE_DEATH_WAIT_MAX); + } + } else { + dlm_wait_for_recovery(dlm); + } goto retry_lock; } |