From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 6 Oct 2021 20:37:34 +0000 (-0400)
Subject: qa: only set frag confs for workloads
X-Git-Tag: v16.2.7~39^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=93a13067aa6cbdc059f1b0f2b6adf3844d4a0255;p=ceph.git

qa: only set frag confs for workloads

Otherwise these local conf overrides prevent functional testing.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---

diff --git a/qa/cephfs/conf/mds.yaml b/qa/cephfs/conf/mds.yaml
index 594590ec637..922f7167ae4 100644
--- a/qa/cephfs/conf/mds.yaml
+++ b/qa/cephfs/conf/mds.yaml
@@ -4,10 +4,6 @@ overrides:
       mds:
         debug mds: 20
         debug ms: 1
-        mds bal fragment size max: 10000
-        mds bal merge size: 5
-        mds bal split bits: 3
-        mds bal split size: 100
         mds debug frag: true
         mds debug scatterstat: true
         mds op complaint time: 180
diff --git a/qa/cephfs/overrides/frag.yaml b/qa/cephfs/overrides/frag.yaml
new file mode 100644
index 00000000000..f05b3f48fe0
--- /dev/null
+++ b/qa/cephfs/overrides/frag.yaml
@@ -0,0 +1,9 @@
+overrides:
+  ceph:
+    conf:
+      mds:
+        mds bal fragment size max: 10000
+        mds bal merge size: 5
+        mds bal split bits: 3
+        mds bal split size: 100
+
diff --git a/qa/suites/fs/thrash/multifs/overrides/frag.yaml b/qa/suites/fs/thrash/multifs/overrides/frag.yaml
new file mode 120000
index 00000000000..5e5cdaed8c7
--- /dev/null
+++ b/qa/suites/fs/thrash/multifs/overrides/frag.yaml
@@ -0,0 +1 @@
+.qa/cephfs/overrides/frag.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/thrash/workloads/overrides/frag.yaml b/qa/suites/fs/thrash/workloads/overrides/frag.yaml
new file mode 120000
index 00000000000..5e5cdaed8c7
--- /dev/null
+++ b/qa/suites/fs/thrash/workloads/overrides/frag.yaml
@@ -0,0 +1 @@
+.qa/cephfs/overrides/frag.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/workload/overrides/frag.yaml b/qa/suites/fs/workload/overrides/frag.yaml
new file mode 120000
index 00000000000..5e5cdaed8c7
--- /dev/null
+++ b/qa/suites/fs/workload/overrides/frag.yaml
@@ -0,0 +1 @@
+.qa/cephfs/overrides/frag.yaml
\ No newline at end of file