RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-19 08:57:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21119 from Liuchang0812/refine-optracker-history

Browse Source 
common, osd: duplicated "start" event in OpTracker, improve OpTracker::dump_ops

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Kefu Chai 2018-04-07 17:23:35 +08:00 committed by GitHub
commit 52012a069c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/common/TrackedOp.cc
View File

@ -108,7 +108,7 @@ void OpHistory::cleanup(utime_t now)
}
}
void OpHistory::dump_ops(utime_t now, Formatter *f, set<string> filters)
void OpHistory::dump_ops(utime_t now, Formatter *f, set<string> filters, bool by_duration)
{
Mutex::Locker history_lock(ops_history_lock);
cleanup(now);
@ -117,50 +117,20 @@ void OpHistory::dump_ops(utime_t now, Formatter *f, set<string> filters)
f->dump_int("duration", history_duration);
{
f->open_array_section("ops");
for (set<pair<utime_t, TrackedOpRef> >::const_iterator i =
arrived.begin();
i != arrived.end();
++i) {
if (!i->second->filter_out(filters))
continue;
f->open_object_section("op");
i->second->dump(now, f);
f->close_section();
}
f->close_section();
}
f->close_section();
}
void OpHistory::dump_ops_by_duration(utime_t now, Formatter *f, set<string> filters)
{
Mutex::Locker history_lock(ops_history_lock);
cleanup(now);
f->open_object_section("op_history");
f->dump_int("size", history_size);
f->dump_int("duration", history_duration);
{
f->open_array_section("ops");
if (arrived.size()) {
vector<pair<double, TrackedOpRef> > durationvec;
durationvec.reserve(arrived.size());
for (set<pair<utime_t, TrackedOpRef> >::const_iterator i =
arrived.begin();
i != arrived.end();
++i) {
auto dump_fn = [&f, &now, &filters](auto begin_iter, auto end_iter) {
for (auto i=begin_iter; i!=end_iter; ++i) {
if (!i->second->filter_out(filters))
continue;
durationvec.push_back(pair<double, TrackedOpRef>(i->second->get_duration(), i->second));
}
sort(durationvec.begin(), durationvec.end());
for (auto i = durationvec.rbegin(); i != durationvec.rend(); ++i) {
f->open_object_section("op");
i->second->dump(now, f);
f->close_section();
}
};
if (by_duration) {
dump_fn(duration.rbegin(), duration.rend());
} else {
dump_fn(arrived.begin(), arrived.end());
}
f->close_section();
}
@ -203,11 +173,7 @@ bool OpTracker::dump_historic_ops(Formatter *f, bool by_duration, set<string> fi
RWLock::RLocker l(lock);
utime_t now = ceph_clock_now();
if (by_duration) {
history.dump_ops_by_duration(now, f, filters);
} else {
history.dump_ops(now, f, filters);
}
history.dump_ops(now, f, filters, by_duration);
return true;
}

3
src/common/TrackedOp.h
View File

@ -84,8 +84,7 @@ public:
}
void _insert_delayed(const utime_t& now, TrackedOpRef op);
void dump_ops(utime_t now, Formatter *f, set<string> filters = {""});
void dump_ops_by_duration(utime_t now, Formatter *f, set<string> filters = {""});
void dump_ops(utime_t now, Formatter *f, set<string> filters = {""}, bool by_duration=false);
void dump_slow_ops(utime_t now, Formatter *f, set<string> filters = {""});
void on_shutdown();
void set_size_and_duration(uint32_t new_size, uint32_t new_duration) {

2
src/osd/ECBackend.cc
View File

@ -880,7 +880,7 @@ void ECBackend::handle_sub_write(
const ZTracer::Trace &trace)
{
if (msg)
msg->mark_started();
msg->mark_event("sub_op_started");
trace.event("handle_sub_write");
if (!get_parent()->pgb_is_primary())
get_parent()->update_stats(op.stats);