From d7585c020de41f25e6a598661844169f2bdbb2b4 Mon Sep 17 00:00:00 2001 From: Jianpeng Ma Date: Mon, 6 Jul 2015 13:49:42 +0800 Subject: [PATCH] common/TrackedOp: check tracking_enabled for event "initiated/done". Signed-off-by: Jianpeng Ma --- src/common/TrackedOp.cc | 2 +- src/common/TrackedOp.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/TrackedOp.cc b/src/common/TrackedOp.cc index c7592fdec31ad..a96b915991747 100644 --- a/src/common/TrackedOp.cc +++ b/src/common/TrackedOp.cc @@ -294,12 +294,12 @@ void OpTracker::_mark_event(TrackedOp *op, const string &evt, } void OpTracker::RemoveOnDelete::operator()(TrackedOp *op) { - op->mark_event("done"); if (!tracker->tracking_enabled) { op->_unregistered(); delete op; return; } + op->mark_event("done"); tracker->unregister_inflight_op(op); // Do not delete op, unregister_inflight_op took control } diff --git a/src/common/TrackedOp.h b/src/common/TrackedOp.h index 42d1eafe7005d..b2015b88f9604 100644 --- a/src/common/TrackedOp.h +++ b/src/common/TrackedOp.h @@ -161,7 +161,8 @@ protected: warn_interval_multiplier(1) { tracker->register_inflight_op(&xitem); - events.push_back(make_pair(initiated_at, "initiated")); + if (tracker->tracking_enabled) + events.push_back(make_pair(initiated_at, "initiated")); } /// output any type-specific data you want to get when dump() is called -- 2.39.5