RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-03 01:22:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

osd: support dumping historic slow ops

Browse Source 
ceph daemon osd.x dump_historic_slow_ops

Signed-off-by: Zhiqiang Wang <zhiqiang@xsky.com>
This commit is contained in:
Zhiqiang Wang 2017-01-20 17:03:00 +08:00
parent 47248f3554
commit aab8562eae
3 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/common/TrackedOp.cc
View File

@ -174,6 +174,39 @@ bool OpTracker::dump_historic_ops(Formatter *f, bool by_duration)
return true;
}
void OpHistory::dump_slow_ops(utime_t now, Formatter *f)
{
Mutex::Locker history_lock(ops_history_lock);
cleanup(now);
f->open_object_section("OpHistory slow ops");
f->dump_int("num to keep", history_slow_op_size);
f->dump_int("threshold to keep", history_slow_op_threshold);
{
f->open_array_section("Ops");
for (set<pair<utime_t, TrackedOpRef> >::const_iterator i =
slow_op.begin();
i != slow_op.end();
++i) {
f->open_object_section("Op");
i->second->dump(now, f);
f->close_section();
}
f->close_section();
}
f->close_section();
}
bool OpTracker::dump_historic_slow_ops(Formatter *f)
{
RWLock::RLocker l(lock);
if (!tracking_enabled)
return false;
utime_t now = ceph_clock_now();
history.dump_slow_ops(now, f);
return true;
}
bool OpTracker::dump_ops_in_flight(Formatter *f, bool print_only_blocked)
{
RWLock::RLocker l(lock);

2
src/common/TrackedOp.h
View File

@ -54,6 +54,7 @@ public:
void insert(utime_t now, TrackedOpRef op);
void dump_ops(utime_t now, Formatter *f);
void dump_ops_by_duration(utime_t now, Formatter *f);
void dump_slow_ops(utime_t now, Formatter *f);
void on_shutdown();
void set_size_and_duration(uint32_t new_size, uint32_t new_duration) {
history_size = new_size;
@ -97,6 +98,7 @@ public:
}
bool dump_ops_in_flight(Formatter *f, bool print_only_blocked=false);
bool dump_historic_ops(Formatter *f, bool by_duration = false);
bool dump_historic_slow_ops(Formatter *f);
bool register_inflight_op(TrackedOp *i);
void unregister_inflight_op(TrackedOp *i);

10
src/osd/OSD.cc
View File

@ -1979,6 +1979,11 @@ bool OSD::asok_command(string admin_command, cmdmap_t& cmdmap, string format,
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.";
}
} else if (admin_command == "dump_historic_slow_ops") {
if (!op_tracker.dump_historic_slow_ops(f)) {
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.";
}
} else if (admin_command == "dump_op_pq_state") {
f->open_object_section("pq");
op_shardedwq.dump(f);
@ -2536,6 +2541,10 @@ void OSD::final_init()
"show the blocked ops currently in flight");
assert(r == 0);
r = admin_socket->register_command("dump_historic_ops", "dump_historic_ops",
asok_hook,
"show recent ops");
assert(r == 0);
r = admin_socket->register_command("dump_historic_slow_ops", "dump_historic_slow_ops",
asok_hook,
"show slowest recent ops");
assert(r == 0);
@ -2975,6 +2984,7 @@ int OSD::shutdown()
cct->get_admin_socket()->unregister_command("dump_blocked_ops");
cct->get_admin_socket()->unregister_command("dump_historic_ops");
cct->get_admin_socket()->unregister_command("dump_historic_ops_by_duration");
cct->get_admin_socket()->unregister_command("dump_historic_slow_ops");
cct->get_admin_socket()->unregister_command("dump_op_pq_state");
cct->get_admin_socket()->unregister_command("dump_blacklist");
cct->get_admin_socket()->unregister_command("dump_watchers");