From 375c29537e78d758f74a0366a2b27ed021a34d2b Mon Sep 17 00:00:00 2001 From: Xiubo Li Date: Mon, 8 Jul 2024 15:53:28 +0800 Subject: [PATCH] mds: avoid acquiring the wrlock twice for a single request In case the current request has lock cache attached and then the lock cache must have already acquired the wrlock of filelock. So currently the path_traverse() will acquire the wrlock twice and possibly caused deadlock by itself. Fixes: https://tracker.ceph.com/issues/65607 Signed-off-by: Xiubo Li Signed-off-by: Sunnatillo (cherry picked from commit 276b81a55d391b52f9772fc76b86b845eb3854a6) Conflicts: src/mds/MDSRank.cc This commit moves around the config `mds_allow_async_dirops` in the tracked keys which caused the conflict - avoid the move. --- src/mds/MDCache.cc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index 34d83d50de3..dcdab4c0a05 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -8447,8 +8447,11 @@ int MDCache::path_traverse(MDRequestRef& mdr, MDSContextFactory& cf, lov.add_xlock(&dn->lock); } else { // force client to flush async dir operation if necessary - if (cur->filelock.is_cached()) + if (cur->filelock.is_cached() && + !(mdr->lock_cache && + static_cast(mdr->lock_cache)->is_wrlocked(&cur->filelock))) { lov.add_wrlock(&cur->filelock); + } lov.add_rdlock(&dn->lock); } if (!mds->locker->acquire_locks(mdr, lov)) { @@ -8568,8 +8571,11 @@ int MDCache::path_traverse(MDRequestRef& mdr, MDSContextFactory& cf, lov.add_xlock(&dn->lock); } else { // force client to flush async dir operation if necessary - if (cur->filelock.is_cached()) + if (cur->filelock.is_cached() && + !(mdr->lock_cache && + static_cast(mdr->lock_cache)->is_wrlocked(&cur->filelock))) { lov.add_wrlock(&cur->filelock); + } lov.add_rdlock(&dn->lock); } if (!mds->locker->acquire_locks(mdr, lov)) { -- 2.39.5