mds: make dirfrag thrashing join and split

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/mds/MDBalancer.cc b/src/mds/MDBalancer.cc
index da08bf1949ebf34b371c48fc2316ae0ee84f4a19..9a932101f9260a05c9651077912693ac4699f0a6 100644 (file)
--- a/src/mds/MDBalancer.cc
+++ b/src/mds/MDBalancer.cc
@@ -314,6 +314,11 @@ void MDBalancer::queue_split(CDir *dir)
   split_queue.insert(dir->dirfrag());
 }
 
+void MDBalancer::queue_merge(CDir *dir)
+{
+  merge_queue.insert(dir->dirfrag());
+}
+
 void MDBalancer::do_fragmenting()
 {
   if (split_queue.empty() && merge_queue.empty()) {

diff --git a/src/mds/MDBalancer.h b/src/mds/MDBalancer.h
index e4eb530b4494afc03483e91c7e0b7a9eec92dc05..2b983787a07cb5517e3d35b64cdf34332dcf7dcd 100644 (file)
--- a/src/mds/MDBalancer.h
+++ b/src/mds/MDBalancer.h
@@ -117,6 +117,7 @@ public:
   void dump_pop_map();  
 
   void queue_split(CDir *dir);
+  void queue_merge(CDir *dir);
 
 };
 

diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index af6e3afa5e1d39b2614e96e0ca52577d48dbea73..4e851fe005064b3f0cfb9b7157f8ab827f5d70ae 100644 (file)
--- a/src/mds/MDS.cc
+++ b/src/mds/MDS.cc
@@ -1698,7 +1698,10 @@ do { \
     CDir *dir = ls.front();
     if (!dir->get_parent_dir()) continue;    // must be linked.
     if (!dir->is_auth()) continue;           // must be auth.
-    mdcache->split_dir(dir, 1);// + (rand() % 3));
+    if (dir->get_frag() == frag_t() || (rand() % 3 == 0)) {
+      mdcache->split_dir(dir, 1);
+    } else
+      balancer->queue_merge(dir);
   }
 
   // hack: force hash root?