OpTracker: use mark_event rather than _mark_event

mark_event() interfaced changed to accept time and it is default
to 'now'. The mark_event is the wrapper function of _mark_event()
and it has the check for optracking enabled/disabled as well.
The _mark_event() is now a private function.

Signed-off-by: Somnath Roy <somnath.roy@sandisk.com>

diff --git a/src/common/TrackedOp.cc b/src/common/TrackedOp.cc
index 7aa6a000af1f8957ed8d0b105d3de21e57e97f93..4055230b147da0a2052071575af66ccd4638e464 100644 (file)
--- a/src/common/TrackedOp.cc
+++ b/src/common/TrackedOp.cc
@@ -221,12 +221,11 @@ void OpTracker::get_age_ms_histogram(pow2_hist_t *h)
     h->set_bin(bin, count);
 }
 
-void OpTracker::mark_event(TrackedOp *op, const string &dest)
+void OpTracker::mark_event(TrackedOp *op, const string &dest, utime_t time)
 {
   if (!tracking_enabled)
     return;
-  utime_t now = ceph_clock_now(cct);
-  return _mark_event(op, dest, now);
+  return _mark_event(op, dest, time);
 }
 
 void OpTracker::_mark_event(TrackedOp *op, const string &evt,

diff --git a/src/common/TrackedOp.h b/src/common/TrackedOp.h
index ae42d7014899e26995396ba981c80db024ef3bed..9a06d12791c1b10da01ff001a356fca1d72ee960 100644 (file)
--- a/src/common/TrackedOp.h
+++ b/src/common/TrackedOp.h
@@ -65,6 +65,7 @@ class OpTracker {
   OpHistory history;
   float complaint_time;
   int log_threshold;
+  void _mark_event(TrackedOp *op, const string &evt, utime_t now);
 
 public:
   bool tracking_enabled;
@@ -95,8 +96,8 @@ public:
    * @return True if there are any Ops to warn on, false otherwise.
    */
   bool check_ops_in_flight(std::vector<string> &warning_strings);
-  void mark_event(TrackedOp *op, const string &evt);
-  void _mark_event(TrackedOp *op, const string &evt, utime_t now);
+  void mark_event(TrackedOp *op, const string &evt,
+                          utime_t time = ceph_clock_now(g_ceph_context));
 
   void on_shutdown() {
     Mutex::Locker l(ops_in_flight_lock);

diff --git a/src/mds/Mutation.h b/src/mds/Mutation.h
index d211238f2d5804f5c12bd6d33f1a89db29e52a57..ed3f0fa0d474654831eda7a47c29a83d2697fdf1 100644 (file)
--- a/src/mds/Mutation.h
+++ b/src/mds/Mutation.h
@@ -297,11 +297,11 @@ struct MDRequestImpl : public MutationImpl, public TrackedOp {
     waited_for_osdmap(false), _more(NULL) {
     in[0] = in[1] = NULL;
     if (!params.throttled.is_zero())
-      tracker->_mark_event(this, "throttled", params.throttled);
+      tracker->mark_event(this, "throttled", params.throttled);
     if (!params.all_read.is_zero())
-      tracker->_mark_event(this, "all_read", params.all_read);
+      tracker->mark_event(this, "all_read", params.all_read);
     if (!params.dispatched.is_zero())
-      tracker->_mark_event(this, "dispatched", params.dispatched);
+      tracker->mark_event(this, "dispatched", params.dispatched);
   }
   ~MDRequestImpl();
   

diff --git a/src/osd/OpRequest.cc b/src/osd/OpRequest.cc
index 2262ab85391a87db22f277964bbad61f9ab360ae..8e2ffb2797918c6947f785bcfa848701b60845a3 100644 (file)
--- a/src/osd/OpRequest.cc
+++ b/src/osd/OpRequest.cc
@@ -28,10 +28,10 @@ OpRequest::OpRequest(Message *req, OpTracker *tracker) :
   } else if (req->get_type() == MSG_OSD_SUBOP) {
     reqid = static_cast<MOSDSubOp*>(req)->reqid;
   }
-  tracker->_mark_event(this, "header_read", request->get_recv_stamp());
-  tracker->_mark_event(this, "throttled", request->get_throttle_stamp());
-  tracker->_mark_event(this, "all_read", request->get_recv_complete_stamp());
-  tracker->_mark_event(this, "dispatched", request->get_dispatch_stamp());
+  tracker->mark_event(this, "header_read", request->get_recv_stamp());
+  tracker->mark_event(this, "throttled", request->get_throttle_stamp());
+  tracker->mark_event(this, "all_read", request->get_recv_complete_stamp());
+  tracker->mark_event(this, "dispatched", request->get_dispatch_stamp());
 }
 
 void OpRequest::_dump(utime_t now, Formatter *f) const