From 880cf3569f3097e6e755c96cbc7a2a58728d299c Mon Sep 17 00:00:00 2001 From: "Yan, Zheng" Date: Sun, 9 Jun 2019 11:27:28 +0800 Subject: [PATCH] mds: wake up lock waiters after forcibly changing lock state commit df79944a "mds: cleanup unneeded client_snap_caps when splitting snap inode" is incomplete. Fixes: http://tracker.ceph.com/issues/39987 Signed-off-by: "Yan, Zheng" (cherry picked from commit 0a1e92abf1cfc8bddf526cbf5bceea7b854dcfe8) --- src/mds/MDCache.cc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index 886b0eef1a3..5f4411d9c1c 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -1487,6 +1487,8 @@ CInode *MDCache::cow_inode(CInode *in, snapid_t last) in->client_snap_caps.clear(); in->item_open_file.remove_myself(); in->item_caps.remove_myself(); + + MDSContext::vec finished; for (const auto &p : client_snap_caps) { SimpleLock *lock = in->get_lock(p.first); ceph_assert(lock); @@ -1495,10 +1497,13 @@ CInode *MDCache::cow_inode(CInode *in, snapid_t last) lock->put_wrlock(); (void)q; /* unused */ } - ceph_assert(!lock->get_num_wrlocks()); - lock->set_state(LOCK_SYNC); - in->auth_unpin(lock); + if (!lock->get_num_wrlocks()) { + lock->set_state(LOCK_SYNC); + lock->take_waiting(SimpleLock::WAIT_STABLE|SimpleLock::WAIT_RD, finished); + in->auth_unpin(lock); + } } + mds->queue_waiters(finished); } return oldin; } -- 2.47.3