From: Jianpeng Ma <jianpeng.ma@intel.com>
Date: Tue, 14 Jul 2015 14:02:21 +0000 (+0800)
Subject: common: clean up code for OpTracker::check_ops_in_flight.
X-Git-Tag: v9.0.3~36^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F5230%2Fhead;p=ceph.git

common: clean up code for OpTracker::check_ops_in_flight.

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

diff --git a/src/common/TrackedOp.cc b/src/common/TrackedOp.cc
index a96b91599174..f759894fb048 100644
--- a/src/common/TrackedOp.cc
+++ b/src/common/TrackedOp.cc
@@ -187,6 +187,8 @@ bool OpTracker::check_ops_in_flight(std::vector<string> &warning_vector)
     return false;
 
   warning_vector.reserve(log_threshold + 1);
+  //store summary message
+  warning_vector.push_back("");
 
   int slow = 0;     // total slow
   int warned = 0;   // total logged
@@ -205,8 +207,6 @@ bool OpTracker::check_ops_in_flight(std::vector<string> &warning_vector)
       if (((*i)->get_initiated() +
 	 (complaint_time * (*i)->warn_interval_multiplier)) < now) {
       // will warn
-        if (warning_vector.empty())
-          warning_vector.push_back("");
         warned++;
         if (warned > log_threshold)
           break;
@@ -236,7 +236,7 @@ bool OpTracker::check_ops_in_flight(std::vector<string> &warning_vector)
     warning_vector[0] = ss.str();
   }
 
-  return warning_vector.size();
+  return warned;
 }
 
 void OpTracker::get_age_ms_histogram(pow2_hist_t *h)