From: David Zafman <dzafman@redhat.com>
Date: Mon, 14 Mar 2016 22:47:02 +0000 (-0700)
Subject: mds, osd: Fix missing locking for "dump_blocked_ops"
X-Git-Tag: v0.94.10~11^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5717eb001c6202837fe2e22039e3f855ea4aa065;p=ceph.git

mds, osd: Fix missing locking for "dump_blocked_ops"

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit be5bed840f21da998be3b8374a8e33f208258e1b)

Conflicts:
	src/mds/MDSRank.cc (missing dump_blocked_ops in mds)
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index b29c72b6557..3892b366f12 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1692,6 +1692,7 @@ bool OSD::asok_command(string command, cmdmap_t& cmdmap, string format,
       op_tracker.dump_ops_in_flight(f);
     }
   } else if (command == "dump_blocked_ops") {
+    RWLock::RLocker l(op_tracker.lock);
     if (!op_tracker.tracking_enabled) {
       ss << "op_tracker tracking is not enabled now, so no ops are tracked currently, even those get stuck. \
 	Please enable \"osd_enable_op_tracker\", and the tracker will start to track new ops received afterwards.";