]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: fix deadlock on RGWIndexCompletionManager::stop 23590/head
authorYao Zongyou <yaozongyou@vip.qq.com>
Wed, 15 Aug 2018 15:08:29 +0000 (23:08 +0800)
committerYao Zongyou <yaozongyou@vip.qq.com>
Wed, 15 Aug 2018 15:08:29 +0000 (23:08 +0800)
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>
src/rgw/rgw_rados.cc

index b9a07a827cd24bcf2b3be3c1f6f241c57a362bb0..d901599f5b99e601330d4aeb1f505922cc852718 100644 (file)
@@ -3650,7 +3650,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();
       }
     }