From: Yao Zongyou <yaozongyou@vip.qq.com>
Date: Wed, 15 Aug 2018 15:08:29 +0000 (+0800)
Subject: rgw: fix deadlock on RGWIndexCompletionManager::stop
X-Git-Tag: v12.2.9~86^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a756ccc3d527cd0e051021813ad7d3f66c70f0f9;p=ceph.git

rgw: fix deadlock on RGWIndexCompletionManager::stop

The lock has been acquired in complete_op_data::stop
Fixes: http://tracker.ceph.com/issues/26949

Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>
(cherry picked from commit 519cea1bf58461a65bab1e4aecff1fd3ea3191b0)
---

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 876147417a68d..9a22e22e07dc4 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -3602,7 +3602,6 @@ public:
     for (int i = 0; i < num_shards; ++i) {
       Mutex::Locker l(*locks[i]);
       for (auto c : completions[i]) {
-        Mutex::Locker cl(c->lock);
         c->stop();
       }
     }