From: Yan, Zheng <zyan@redhat.com>
Date: Wed, 23 Jan 2019 09:29:27 +0000 (+0800)
Subject: Revert "mds: fix infinite loop in OpTracker::check_ops_in_flight"
X-Git-Tag: v12.2.11~3^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=28aa4c3ae94f55fb4d27c0bbda20d5628ad9ca92;p=ceph.git

Revert "mds: fix infinite loop in OpTracker::check_ops_in_flight"

This reverts commit adad2d873a37770e4910b04dfddf92f70964be4a.
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
---

diff --git a/src/common/TrackedOp.cc b/src/common/TrackedOp.cc
index d3c3c4699662..4ed2fa48bd6f 100644
--- a/src/common/TrackedOp.cc
+++ b/src/common/TrackedOp.cc
@@ -342,10 +342,8 @@ bool OpTracker::check_ops_in_flight(std::vector<string> &warning_vector, int *sl
     while (i != sdata->ops_in_flight_sharded.end() &&
 	   i->get_initiated() < too_old) {
 
-      if (!i->warn_interval_multiplier) {
+      if (!i->warn_interval_multiplier)
 	continue;
-	++i;
-      }
 
       (*slow)++;