]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mds, osd: Fix missing locking for "dump_blocked_ops"
authorDavid Zafman <dzafman@redhat.com>
Mon, 14 Mar 2016 22:47:02 +0000 (15:47 -0700)
committerDavid Zafman <dzafman@redhat.com>
Wed, 23 Nov 2016 22:12:51 +0000 (14:12 -0800)
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit be5bed840f21da998be3b8374a8e33f208258e1b)

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

src/osd/OSD.cc

index b29c72b6557dcd664433a8295c67b2b287bedf44..3892b366f12f3a2420d0fee47ead939375455f30 100644 (file)
@@ -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.";