From: Jianpeng Ma <jianpeng.ma@intel.com>
Date: Mon, 6 Jul 2015 05:49:42 +0000 (+0800)
Subject: common/TrackedOp: check tracking_enabled for event "initiated/done".
X-Git-Tag: v9.0.3~81^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d7585c020de41f25e6a598661844169f2bdbb2b4;p=ceph.git

common/TrackedOp: check tracking_enabled for event "initiated/done".

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
---

diff --git a/src/common/TrackedOp.cc b/src/common/TrackedOp.cc
index c7592fdec31a..a96b91599174 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 42d1eafe7005..b2015b88f960 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