From: Xiubo Li <xiubli@redhat.com>
Date: Mon, 13 Apr 2020 01:41:38 +0000 (-0400)
Subject: tools/cephfs: Disable dirfrag auto merging and splitting
X-Git-Tag: v16.1.0~2571^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=39df09e52b84b688f99f4e18190683c957d40783;p=ceph.git

tools/cephfs: Disable dirfrag auto merging and splitting

Make sure that the dirfrag auto merging and splitting are disabled
explicitly.

Fixes: https://tracker.ceph.com/issues/44380
Signed-off-by: Xiubo Li <xiubli@redhat.com>
---

diff --git a/qa/tasks/cephfs/test_data_scan.py b/qa/tasks/cephfs/test_data_scan.py
index d4733bf32bf..a8e5badd480 100644
--- a/qa/tasks/cephfs/test_data_scan.py
+++ b/qa/tasks/cephfs/test_data_scan.py
@@ -431,6 +431,10 @@ class TestDataScan(CephFSTestCase):
         file_count = 100
         file_names = ["%s" % n for n in range(0, file_count)]
 
+        # Make sure and disable dirfrag auto merging and splitting
+        self.fs.set_ceph_conf('mds', 'mds bal merge size', 0)
+        self.fs.set_ceph_conf('mds', 'mds bal split size', 100 * file_count)
+
         # Create a directory of `file_count` files, each named after its
         # decimal number and containing the string of its decimal number
         self.mount_a.run_python(dedent("""