*** empty log message ***

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@425 29311d96-e01e-0410-9327-a35deaab8ce9

diff --git a/ceph/mds/MDBalancer.cc b/ceph/mds/MDBalancer.cc
index b0d145f0a1a15f593ee1788d8e0bd824c7593f88..4c474e698354e7efdbe919b9f522fdfba3f22906 100644 (file)
--- a/ceph/mds/MDBalancer.cc
+++ b/ceph/mds/MDBalancer.cc
@@ -124,7 +124,7 @@ void MDBalancer::handle_heartbeat(MHeartbeat *m)
   if (mds_load.size() == cluster_size) {
        // let's go!
        export_empties();
-       do_rebalance();
+       do_rebalance(m->get_beat());
   }
   
   // done
@@ -149,7 +149,7 @@ void MDBalancer::export_empties()
 
 
 
-void MDBalancer::do_rebalance()
+void MDBalancer::do_rebalance(int beat)
 {
   timepair_t now = g_clock.gettimepair();
 
@@ -187,7 +187,7 @@ void MDBalancer::do_rebalance()
   // determine load transfer mapping
   multimap<int,double> my_targets;
 
-  if (0) {
+  if (beat % 2 == 1) {
        // old way
        
        // match up big exporters with big importers

diff --git a/ceph/mds/MDBalancer.h b/ceph/mds/MDBalancer.h
index 185e7fdf1cf5ceba6721a92eb094e7704729cc34..1bc5e1141613971a81711f4fb3ed74c655544630 100644 (file)
--- a/ceph/mds/MDBalancer.h
+++ b/ceph/mds/MDBalancer.h
@@ -38,7 +38,7 @@ class MDBalancer {
   void handle_heartbeat(MHeartbeat *m);
 
   void export_empties();
-  void do_rebalance();
+  void do_rebalance(int beat);
   void find_exports(CDir *dir, 
                                        double amount, 
                                        list<CDir*>& exports,