1 files changed, 9 insertions, 10 deletions

diff --git a/src/common/TrackedOp.cc b/src/common/TrackedOp.cc
index 82594a6491e..d1dbc1e7135 100644
--- a/src/common/TrackedOp.cc
+++ b/src/common/TrackedOp.cc
@@ -48,14 +48,14 @@ void OpHistory::cleanup(utime_t now)
 {
   while (arrived.size() &&
 	 (now - arrived.begin()->first >
-	  (double)(tracker->cct->_conf->op_tracker_history_duration))) {
+	  (double)(history_duration))) {
     duration.erase(make_pair(
 	arrived.begin()->second->get_duration(),
 	arrived.begin()->second));
     arrived.erase(arrived.begin());
   }
 
-  while (duration.size() > tracker->cct->_conf->op_tracker_history_size) {
+  while (duration.size() > history_size) {
     arrived.erase(make_pair(
 	duration.begin()->second->get_arrived(),
 	duration.begin()->second));
@@ -67,8 +67,8 @@ void OpHistory::dump_ops(utime_t now, Formatter *f)
 {
   cleanup(now);
   f->open_object_section("OpHistory");
-  f->dump_int("num to keep", tracker->cct->_conf->op_tracker_history_size);
-  f->dump_int("duration to keep", tracker->cct->_conf->op_tracker_history_duration);
+  f->dump_int("num to keep", history_size);
+  f->dump_int("duration to keep", history_duration);
   {
     f->open_array_section("Ops");
     for (set<pair<utime_t, TrackedOpRef> >::const_iterator i =
@@ -132,7 +132,7 @@ bool OpTracker::check_ops_in_flight(std::vector<string> &warning_vector)
 
   utime_t now = ceph_clock_now(cct);
   utime_t too_old = now;
-  too_old -= cct->_conf->op_tracker_complaint_time;
+  too_old -= complaint_time;
 
   utime_t oldest_secs = now - ops_in_flight.front()->get_arrived();
 
@@ -140,11 +140,11 @@ bool OpTracker::check_ops_in_flight(std::vector<string> &warning_vector)
            << "; oldest is " << oldest_secs
            << " seconds old" << dendl;
 
-  if (oldest_secs < cct->_conf->op_tracker_complaint_time)
+  if (oldest_secs < complaint_time)
     return false;
 
   xlist<TrackedOp*>::iterator i = ops_in_flight.begin();
-  warning_vector.reserve(cct->_conf->op_tracker_log_threshold + 1);
+  warning_vector.reserve(log_threshold + 1);
 
   int slow = 0;     // total slow
   int warned = 0;   // total logged
@@ -153,13 +153,12 @@ bool OpTracker::check_ops_in_flight(std::vector<string> &warning_vector)
 
     // exponential backoff of warning intervals
     if (((*i)->get_arrived() +
-	 (cct->_conf->op_tracker_complaint_time *
-	  (*i)->warn_interval_multiplier)) < now) {
+	 (complaint_time * (*i)->warn_interval_multiplier)) < now) {
       // will warn
       if (warning_vector.empty())
 	warning_vector.push_back("");
       warned++;
-      if (warned > cct->_conf->op_tracker_log_threshold)
+      if (warned > log_threshold)
         break;
 
       utime_t age = now - (*i)->get_arrived();