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

mds: fix infinite loop in OpTracker::check_ops_in_flight

introduced by backport commit 02faf3d
"mds: don't report slow request for blocked filelock request"

Fixes: http://tracker.ceph.com/issues/37977
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
---

diff --git a/src/common/TrackedOp.cc b/src/common/TrackedOp.cc
index 4ed2fa48bd6f..788b29744488 100644
--- a/src/common/TrackedOp.cc
+++ b/src/common/TrackedOp.cc
@@ -342,8 +342,10 @@ 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) {
+	++i;
 	continue;
+      }
 
       (*slow)++;