]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: fix deadlock on RGWIndexCompletionManager::stop 24069/head
authorYao Zongyou <yaozongyou@vip.qq.com>
Wed, 15 Aug 2018 15:08:29 +0000 (23:08 +0800)
committerPrashant D <pdhange@redhat.com>
Thu, 13 Sep 2018 02:11:19 +0000 (22:11 -0400)
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)

src/rgw/rgw_rados.cc

index 876147417a68d2044c6d41aa0e3d2858ba36d087..9a22e22e07dc412c8ceb9e858915923740e04299 100644 (file)
@@ -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();
       }
     }