From: Yan, Zheng <zyan@redhat.com>
Date: Wed, 1 Aug 2018 05:16:10 +0000 (+0800)
Subject: mds: don't queue straydir for split
X-Git-Tag: v12.2.9~87^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=461dcf6b28bee4c60edffb52203c75b4bc84b620;p=ceph.git

mds: don't queue straydir for split

straydir can not get splitted (for now at least)

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

Conflicts:
	src/mds/MDBalancer.cc
- finesse split/merge conditional expression
---

diff --git a/src/mds/MDBalancer.cc b/src/mds/MDBalancer.cc
index edac476f7f9f..9cfc539aa1c8 100644
--- a/src/mds/MDBalancer.cc
+++ b/src/mds/MDBalancer.cc
@@ -1148,7 +1148,9 @@ void MDBalancer::maybe_fragment(CDir *dir, bool hot)
 {
   // split/merge
   if (g_conf->mds_bal_frag && 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/base (for now at least)
+      !dir->inode->is_stray()) { // not straydir
 
     // split
     if (g_conf->mds_bal_split_size > 0 &&