qa: fold frag confs into conf/mds.yaml

These overrides are standard for all configurations. The config to
enable fragmentation is also long removed.

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

diff --git a/qa/cephfs/conf/mds.yaml b/qa/cephfs/conf/mds.yaml
index 922f7167ae4742c742d851582ace9d09d5fde5dd..594590ec63769f574ccced1bd29d4d9fa01d2a8d 100644 (file)
--- a/qa/cephfs/conf/mds.yaml
+++ b/qa/cephfs/conf/mds.yaml
@@ -4,6 +4,10 @@ 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_enable.yaml b/qa/cephfs/overrides/frag_enable.yaml
deleted file mode 100644 (file)
index f1ccc1c..0000000
--- a/qa/cephfs/overrides/frag_enable.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      mds:
-        mds bal frag: true
-        mds bal fragment size max: 10000
-        mds bal split size: 100
-        mds bal merge size: 5
-        mds bal split bits: 3

diff --git a/qa/suites/fs/32bits/overrides/frag_enable.yaml b/qa/suites/fs/32bits/overrides/frag_enable.yaml
deleted file mode 120000 (symlink)
index 34a39a3..0000000
--- a/qa/suites/fs/32bits/overrides/frag_enable.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/frag_enable.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/bugs/client_trim_caps/overrides/frag_enable.yaml b/qa/suites/fs/bugs/client_trim_caps/overrides/frag_enable.yaml
deleted file mode 120000 (symlink)
index 34a39a3..0000000
--- a/qa/suites/fs/bugs/client_trim_caps/overrides/frag_enable.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/frag_enable.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/full/overrides/frag_enable.yaml b/qa/suites/fs/full/overrides/frag_enable.yaml
deleted file mode 120000 (symlink)
index 34a39a3..0000000
--- a/qa/suites/fs/full/overrides/frag_enable.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/frag_enable.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/functional/overrides/frag_enable.yaml b/qa/suites/fs/functional/overrides/frag_enable.yaml
deleted file mode 120000 (symlink)
index 34a39a3..0000000
--- a/qa/suites/fs/functional/overrides/frag_enable.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/frag_enable.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/libcephfs/overrides/frag_enable.yaml b/qa/suites/fs/libcephfs/overrides/frag_enable.yaml
deleted file mode 120000 (symlink)
index 34a39a3..0000000
--- a/qa/suites/fs/libcephfs/overrides/frag_enable.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/frag_enable.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/mixed-clients/overrides/frag_enable.yaml b/qa/suites/fs/mixed-clients/overrides/frag_enable.yaml
deleted file mode 120000 (symlink)
index 34a39a3..0000000
--- a/qa/suites/fs/mixed-clients/overrides/frag_enable.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/frag_enable.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/multiclient/overrides/frag_enable.yaml b/qa/suites/fs/multiclient/overrides/frag_enable.yaml
deleted file mode 120000 (symlink)
index 34a39a3..0000000
--- a/qa/suites/fs/multiclient/overrides/frag_enable.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/frag_enable.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/multifs/overrides/frag_enable.yaml b/qa/suites/fs/multifs/overrides/frag_enable.yaml
deleted file mode 120000 (symlink)
index 34a39a3..0000000
--- a/qa/suites/fs/multifs/overrides/frag_enable.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/frag_enable.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/permission/overrides/frag_enable.yaml b/qa/suites/fs/permission/overrides/frag_enable.yaml
deleted file mode 120000 (symlink)
index 34a39a3..0000000
--- a/qa/suites/fs/permission/overrides/frag_enable.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/frag_enable.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/shell/overrides/frag_enable.yaml b/qa/suites/fs/shell/overrides/frag_enable.yaml
deleted file mode 120000 (symlink)
index 34a39a3..0000000
--- a/qa/suites/fs/shell/overrides/frag_enable.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/frag_enable.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/snaps/overrides/frag_enable.yaml b/qa/suites/fs/snaps/overrides/frag_enable.yaml
deleted file mode 120000 (symlink)
index 34a39a3..0000000
--- a/qa/suites/fs/snaps/overrides/frag_enable.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/frag_enable.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/thrash/multifs/overrides/frag_enable.yaml b/qa/suites/fs/thrash/multifs/overrides/frag_enable.yaml
deleted file mode 120000 (symlink)
index 34a39a3..0000000
--- a/qa/suites/fs/thrash/multifs/overrides/frag_enable.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/frag_enable.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/thrash/workloads/overrides/frag_enable.yaml b/qa/suites/fs/thrash/workloads/overrides/frag_enable.yaml
deleted file mode 120000 (symlink)
index 34a39a3..0000000
--- a/qa/suites/fs/thrash/workloads/overrides/frag_enable.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/frag_enable.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/traceless/overrides/frag_enable.yaml b/qa/suites/fs/traceless/overrides/frag_enable.yaml
deleted file mode 120000 (symlink)
index 34a39a3..0000000
--- a/qa/suites/fs/traceless/overrides/frag_enable.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/frag_enable.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/overrides/frag_enable.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/overrides/frag_enable.yaml
deleted file mode 120000 (symlink)
index 34a39a3..0000000
--- a/qa/suites/fs/upgrade/featureful_client/old_client/overrides/frag_enable.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/frag_enable.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/overrides/frag_enable.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/overrides/frag_enable.yaml
deleted file mode 120000 (symlink)
index 34a39a3..0000000
--- a/qa/suites/fs/upgrade/featureful_client/upgraded_client/overrides/frag_enable.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/frag_enable.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/upgrade/volumes/import-legacy/overrides/frag_enable.yaml b/qa/suites/fs/upgrade/volumes/import-legacy/overrides/frag_enable.yaml
deleted file mode 120000 (symlink)
index 34a39a3..0000000
--- a/qa/suites/fs/upgrade/volumes/import-legacy/overrides/frag_enable.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/frag_enable.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/verify/overrides/frag_enable.yaml b/qa/suites/fs/verify/overrides/frag_enable.yaml
deleted file mode 120000 (symlink)
index 34a39a3..0000000
--- a/qa/suites/fs/verify/overrides/frag_enable.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/frag_enable.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/volumes/overrides/frag_enable.yaml b/qa/suites/fs/volumes/overrides/frag_enable.yaml
deleted file mode 120000 (symlink)
index 34a39a3..0000000
--- a/qa/suites/fs/volumes/overrides/frag_enable.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/frag_enable.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/workload/overrides/frag_enable.yaml b/qa/suites/fs/workload/overrides/frag_enable.yaml
deleted file mode 120000 (symlink)
index 34a39a3..0000000
--- a/qa/suites/fs/workload/overrides/frag_enable.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/frag_enable.yaml
\ No newline at end of file