]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: don't queue straydir for split
authorYan, Zheng <zyan@redhat.com>
Wed, 1 Aug 2018 05:16:10 +0000 (13:16 +0800)
committerNathan Cutler <ncutler@suse.com>
Sun, 2 Sep 2018 16:51:53 +0000 (18:51 +0200)
straydir can not get splitted (for now at least)

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

src/mds/MDBalancer.cc

index 4c8c3946c3ad79376ff49b0a97bbce9d0546e5ef..5f4b18bd8804f9cdce64d83e967e054675f018e9 100644 (file)
@@ -1132,7 +1132,9 @@ void MDBalancer::maybe_fragment(CDir *dir, bool hot)
 {
   // split/merge
   if (bal_fragment_dirs && bal_fragment_interval > 0 &&
-      dir->is_auth() && !dir->inode->is_base()) {  // not root/base (for now at least)
+      dir->is_auth() &&
+      !dir->inode->is_base() &&  // not root/mdsdir (for now at least)
+      !dir->inode->is_stray()) { // not straydir
 
     // split
     if (g_conf->mds_bal_split_size > 0 && (dir->should_split() || hot)) {