From: Greg Farnum <gregf@hq.newdream.net>
Date: Wed, 12 Jan 2011 22:54:01 +0000 (-0800)
Subject: mds: use direct replay test when deciding whether to rebalance.
X-Git-Tag: v0.25~251^2~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=79c5dc99132466370fddd7c3377f684b7c826161;p=ceph.git

mds: use direct replay test when deciding whether to rebalance.

The previous use of standby_for_rank testing was prone to errors
and I think would have ended up causing bugs if it was in the middle
of a standby_replay run when it got a new MDS map pushing
it into regular replay mode.

Signed-off-by: Greg Farnum <gregf@hq.newdream.net>
---

diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index 6f3bdf6150d1..79372a6a2bc6 100644
--- a/src/mds/MDS.cc
+++ b/src/mds/MDS.cc
@@ -995,7 +995,7 @@ void MDS::handle_mds_map(MMDSMap *m)
 	mdcache->migrator->handle_mds_failure_or_stop(*p);
   }
 
-  if (standby_for_rank < 0) //if we're not replaying
+  if (!is_any_replay())
     balancer->try_rebalance();
 
  out: