]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
common/TrackedOp: clean up code make look good.
authorJianpeng Ma <jianpeng.ma@intel.com>
Mon, 6 Jul 2015 02:48:36 +0000 (10:48 +0800)
committerDavid Zafman <dzafman@redhat.com>
Mon, 21 Nov 2016 19:40:03 +0000 (11:40 -0800)
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
(cherry picked from commit edefd05edce6728774bb396ea4e6641ea53463cd)

src/common/TrackedOp.cc

index 32dbc5398dcc20ff23634354e13afac1fa611a78..1875648fe488ab789dc5bf5e60960f7efe380808 100644 (file)
@@ -155,9 +155,8 @@ 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 -= complaint_time;
-  utime_t oldest_op;
+  utime_t oldest_op = now;
   uint64_t total_ops_in_flight = 0;
-  bool got_first_op = false;
 
   for (uint32_t i = 0; i < num_optracker_shards; i++) {
     ShardedTrackingData* sdata = sharded_in_flight_list[i];
@@ -165,10 +164,7 @@ bool OpTracker::check_ops_in_flight(std::vector<string> &warning_vector)
     Mutex::Locker locker(sdata->ops_in_flight_lock_sharded);
     if (!sdata->ops_in_flight_sharded.empty()) {
       utime_t oldest_op_tmp = sdata->ops_in_flight_sharded.front()->get_initiated();
-      if (!got_first_op) {
-        oldest_op = oldest_op_tmp;
-        got_first_op = true;
-      } else if (oldest_op_tmp < oldest_op) {
+      if (oldest_op_tmp < oldest_op) {
         oldest_op = oldest_op_tmp;
       }
     }