From edefd05edce6728774bb396ea4e6641ea53463cd Mon Sep 17 00:00:00 2001 From: Jianpeng Ma Date: Mon, 6 Jul 2015 10:48:36 +0800 Subject: [PATCH] common/TrackedOp: clean up code make look good. Signed-off-by: Jianpeng Ma --- src/common/TrackedOp.cc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/common/TrackedOp.cc b/src/common/TrackedOp.cc index fbd30b81528c..c7592fdec31a 100644 --- a/src/common/TrackedOp.cc +++ b/src/common/TrackedOp.cc @@ -158,9 +158,8 @@ bool OpTracker::check_ops_in_flight(std::vector &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]; @@ -168,10 +167,7 @@ bool OpTracker::check_ops_in_flight(std::vector &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; } } -- 2.47.3