From: Sage Weil <sage@inktank.com>
Date: Tue, 18 Mar 2014 20:20:56 +0000 (-0700)
Subject: osd: fix OpWQ dump locking
X-Git-Tag: v0.79~109^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ff11965c92ee256701310b6974e5a4e7dc5d69d9;p=ceph.git

osd: fix OpWQ dump locking

The pqueue is protected by the wq lock, not by qlock; for example, see
OpWQ::_enqueue.  qlock protects the pg_for_processing map only.

Fixes: #7735
Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 7ee3442793c7..4c72e42cad6c 100644
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -1114,8 +1114,9 @@ private:
     {}
 
     void dump(Formatter *f) {
-      Mutex::Locker l(qlock);
+      lock();
       pqueue.dump(f);
+      unlock();
     }
 
     void _enqueue_front(pair<PGRef, OpRequestRef> item);