]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: fix infinite loop in OpTracker::check_ops_in_flight 26088/head
authorYan, Zheng <zyan@redhat.com>
Wed, 23 Jan 2019 09:32:05 +0000 (17:32 +0800)
committerYan, Zheng <zyan@redhat.com>
Wed, 23 Jan 2019 09:32:05 +0000 (17:32 +0800)
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>
src/common/TrackedOp.cc

index 4ed2fa48bd6f3f515835770045678a2bbcc5b25f..788b29744488d57ca88c07585f23ac5d88686bc8 100644 (file)
@@ -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)++;