]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: fix deadlock on RGWIndexCompletionManager::stop 24101/head
authorYao Zongyou <yaozongyou@vip.qq.com>
Wed, 15 Aug 2018 15:08:29 +0000 (23:08 +0800)
committerPrashant D <pdhange@redhat.com>
Fri, 14 Sep 2018 03:56:59 +0000 (23:56 -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 503786e7e7c300587a25746e0a844c859b8fca9d..ef9767c2edb64a412f28907091005a13216e4900 100644 (file)
@@ -3593,7 +3593,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();
       }
     }