From: Yan, Zheng <zyan@redhat.com>
Date: Tue, 3 Apr 2018 04:21:07 +0000 (+0800)
Subject: mds: limit run time of load balancer
X-Git-Tag: v12.2.6~41^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a6dab280cf94dbe152f667949818a3489f0e8945;p=ceph.git

mds: limit run time of load balancer

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit fc0d340876fbcd7d1d262c00b987849c052a296d)
---

diff --git a/src/mds/MDBalancer.cc b/src/mds/MDBalancer.cc
index 435d546d42f..83de7910648 100644
--- a/src/mds/MDBalancer.cc
+++ b/src/mds/MDBalancer.cc
@@ -969,6 +969,13 @@ void MDBalancer::find_exports(CDir *dir,
                               double& have,
                               set<CDir*>& already_exporting)
 {
+  utime_t now = ceph_clock_now();
+  if ((double)(now - rebalance_time) > 0.1) {
+    derr << " balancer runs too long"  << dendl_impl;
+    have = amount;
+    return;
+  }
+
   assert(dir->is_auth());
 
   double need = amount - have;