summaryrefslogtreecommitdiffstats
path: root/src/mds/locks.h
diff options
context:
space:
mode:
authorYan, Zheng <zheng.z.yan@intel.com>2013-07-16 08:21:21 +0200
committerYan, Zheng <zheng.z.yan@intel.com>2013-08-05 05:09:07 +0200
commit8f67adfb696714ae23c1ed4661bef8ab9817f3e2 (patch)
tree3b8101acf53a85dc563b0a1eca1abcc7c835204a /src/mds/locks.h
parentmds: handle "state == LOCK_LOCK_XLOCK" when cancelling xlock (diff)
downloadceph-8f67adfb696714ae23c1ed4661bef8ab9817f3e2.tar.xz
ceph-8f67adfb696714ae23c1ed4661bef8ab9817f3e2.zip
mds: change LOCK_SCAN to unstable state
commit 0071b8e75b (mds: stay in SCAN state in file_eval) makes Locker::file_eval() ignore lock in LOCK_SCAN state. If there is no request changes the lock state, the lock can be stuck in LOCK_SCAN state forever. This can cause client read/write hang because lock in LOCK_SCAN state does not allow Frw caps. The fix is change LOCK_SCAN to a unstable state. Thank to the CInode::STATE_RECOVERING check in Locker::eval_gather(), the lock stays in the SCAN state while file is being recovering. The lock will transit to a stable state once the recovery finishes. Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
Diffstat (limited to 'src/mds/locks.h')
-rw-r--r--src/mds/locks.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/mds/locks.h b/src/mds/locks.h
index 2adcbf21fea..d1585cec576 100644
--- a/src/mds/locks.h
+++ b/src/mds/locks.h
@@ -86,7 +86,6 @@ enum {
LOCK_PRE_SCAN,
LOCK_SCAN,
- LOCK_SCAN_LOCK,
LOCK_SNAP_SYNC,