]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/OSD.cc: remove osd_lock for bench 36251/head
authorNeha Ojha <nojha@redhat.com>
Fri, 17 Jul 2020 16:52:56 +0000 (16:52 +0000)
committerNeha Ojha <nojha@redhat.com>
Wed, 22 Jul 2020 21:52:19 +0000 (21:52 +0000)
8987f94416f453829eae6dda08837ef5a42531c6 introduced the osd_lock for the
bench command. Taking the osd_lock in bench can lead to deadlocks, causing the
command to hang as seen in https://tracker.ceph.com/issues/43888.

Fixes: https://tracker.ceph.com/issues/43888
Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
Signed-off-by: Neha Ojha <nojha@redhat.com>
src/osd/OSD.cc

index ef1583a8ff4e2c78e840dacbe91fe622c01f13a3..2c4ea30358ef0deade218069911f6c437b540260 100644 (file)
@@ -2731,7 +2731,6 @@ will start to track new ops received afterwards.";
   }
 
   else if (prefix == "bench") {
-    lock_guard l(osd_lock);
     int64_t count;
     int64_t bsize;
     int64_t osize, onum;