From: Neha Ojha <nojha@redhat.com>
Date: Fri, 17 Jul 2020 16:52:56 +0000 (+0000)
Subject: osd/OSD.cc: remove osd_lock for bench
X-Git-Tag: v15.2.5~31^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0d4f93b7ef90674a98f137133737ef549f49777b;p=ceph.git

osd/OSD.cc: remove osd_lock for bench

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>
(cherry picked from commit d6be0d3f9a091b8a2e20ea607434314d395a821c)
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 4e46511885f0..7b6e1aca215d 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -2709,7 +2709,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;