From 24d0d7eb0165c8b8f923f2d8896b156bfb5e0e60 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 21 Jan 2013 15:59:07 -0800 Subject: [PATCH] osd: dump op priority queue state via admin socket Signed-off-by: Sage Weil --- src/osd/OSD.cc | 9 +++++++++ src/osd/OSD.h | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 67bc52b114b47..b28cace35b47f 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -865,6 +865,12 @@ bool OSD::asok_command(string command, string args, ostream& ss) op_tracker.dump_ops_in_flight(ss); } else if (command == "dump_historic_ops") { op_tracker.dump_historic_ops(ss); + } else if (command == "dump_op_pq_state") { + JSONFormatter f(true); + f.open_object_section("pq"); + op_wq.dump(&f); + f.close_section(); + f.flush(ss); } else { assert(0 == "broken asok registration"); } @@ -970,6 +976,8 @@ int OSD::init() "show the ops currently in flight"); r = admin_socket->register_command("dump_historic_ops", asok_hook, "show slowest recent ops"); + r = admin_socket->register_command("dump_op_pq_state", asok_hook, + "dump op priority queue state"); assert(r == 0); service.init(); @@ -1124,6 +1132,7 @@ int OSD::shutdown() cct->get_admin_socket()->unregister_command("dump_ops_in_flight"); cct->get_admin_socket()->unregister_command("dump_historic_ops"); + cct->get_admin_socket()->unregister_command("dump_op_pq_state"); delete asok_hook; asok_hook = NULL; diff --git a/src/osd/OSD.h b/src/osd/OSD.h index 4b9e0e0b192af..c9b408a2747c5 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -644,6 +644,11 @@ private: o->cct->_conf->osd_op_pq_min_cost) {} + void dump(Formatter *f) { + Mutex::Locker l(qlock); + pqueue.dump(f); + } + void _enqueue_front(pair item); void _enqueue(pair item); PGRef _dequeue(); -- 2.39.5