qa: create common conf for all cephfs suites

This will be followed by removing common CephFS configurations in the
ceph.conf.template in teuthology.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 73fa0efcbb15a47157615705043288f2913ff3bc)

Conflicts:
	qa/suites/fs/32bits/overrides/debug.yaml
	qa/suites/fs/basic_functional/overrides/debug.yaml
	qa/suites/fs/basic_workload/overrides/debug.yaml
	qa/suites/fs/bugs/client_trim_caps/overrides/debug.yaml
	qa/suites/fs/multiclient/overrides/debug.yaml
	qa/suites/fs/multifs/overrides/debug.yaml
	qa/suites/fs/permission/overrides/debug.yaml
	qa/suites/fs/snaps/overrides/debug.yaml
	qa/suites/fs/upgrade/snaps/conf
	qa/suites/fs/thrash/overrides/debug.yaml
	qa/suites/fs/traceless/overrides/debug.yaml
	qa/suites/fs/verify/overrides/debug.yaml
	qa/suites/kcephfs/cephfs/overrides/debug.yaml
	qa/suites/kcephfs/mixed-clients/overrides/debug.yaml
	qa/suites/kcephfs/recovery/overrides/debug.yaml
	qa/suites/kcephfs/thrash/overrides/debug.yaml

diff --git a/qa/cephfs/conf/+ b/qa/cephfs/conf/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/cephfs/conf/client.yaml b/qa/cephfs/conf/client.yaml
new file mode 100644 (file)
index 0000000..96026f9
--- /dev/null
+++ b/qa/cephfs/conf/client.yaml
@@ -0,0 +1,7 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        client mount timeout: 600
+        debug ms: 1
+        debug client: 20

diff --git a/qa/cephfs/conf/mds.yaml b/qa/cephfs/conf/mds.yaml
new file mode 100644 (file)
index 0000000..86ebf55
--- /dev/null
+++ b/qa/cephfs/conf/mds.yaml
@@ -0,0 +1,9 @@
+overrides:
+  ceph:
+    conf:
+      mds:
+        mds debug scatterstat: true
+        mds verify scatter: true
+        mds debug frag: true
+        debug ms: 1
+        debug mds: 20

diff --git a/qa/cephfs/overrides/debug.yaml b/qa/cephfs/overrides/debug.yaml
deleted file mode 100644 (file)
index cf5995f..0000000
--- a/qa/cephfs/overrides/debug.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      mds:
-        debug ms: 1
-        debug mds: 20
-      client:
-        debug ms: 1
-        debug client: 20

diff --git a/qa/cephfs/overrides/whitelist_wrongly_marked_down.yaml b/qa/cephfs/overrides/whitelist_wrongly_marked_down.yaml
index 9e090d7ded072a64bf08420c0c4cefa3c255c9a1..48c1b837d7a878ea77b3e7630a3ec4c446a95d08 100644 (file)
--- a/qa/cephfs/overrides/whitelist_wrongly_marked_down.yaml
+++ b/qa/cephfs/overrides/whitelist_wrongly_marked_down.yaml
@@ -7,9 +7,3 @@ overrides:
       - but it is still running
 # MDS daemon 'b' is not responding, replacing it as rank 0 with standby 'a'
       - is not responding
-    conf:
-      mds:
-        debug mds: 20
-        debug ms: 1
-      client:
-        debug client: 10

diff --git a/qa/suites/fs/32bits/conf b/qa/suites/fs/32bits/conf
new file mode 120000 (symlink)
index 0000000..16e8cc4
--- /dev/null
+++ b/qa/suites/fs/32bits/conf
@@ -0,0 +1 @@
+.qa/cephfs/conf
\ No newline at end of file

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

diff --git a/qa/suites/fs/basic_functional/conf b/qa/suites/fs/basic_functional/conf
new file mode 120000 (symlink)
index 0000000..16e8cc4
--- /dev/null
+++ b/qa/suites/fs/basic_functional/conf
@@ -0,0 +1 @@
+.qa/cephfs/conf
\ No newline at end of file

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

diff --git a/qa/suites/fs/basic_workload/conf b/qa/suites/fs/basic_workload/conf
new file mode 120000 (symlink)
index 0000000..16e8cc4
--- /dev/null
+++ b/qa/suites/fs/basic_workload/conf
@@ -0,0 +1 @@
+.qa/cephfs/conf
\ No newline at end of file

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

diff --git a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_pjd.yaml b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_pjd.yaml
index 7cb0b0f6e6bf27a1a1f10a01a8734a5d147b5a82..a1e2ada19e995b5916b8f63edf31a05ba55862c5 100644 (file)
--- a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_pjd.yaml
+++ b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_pjd.yaml
@@ -2,13 +2,8 @@ overrides:
   ceph:
     conf:
       client:
-        debug ms: 1
-        debug client: 20
         fuse set user groups: true
         fuse default permissions: false
-      mds:
-        debug ms: 1
-        debug mds: 20
 tasks:
 - workunit:
     clients:

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

diff --git a/qa/suites/fs/bugs/conf b/qa/suites/fs/bugs/conf
new file mode 120000 (symlink)
index 0000000..16e8cc4
--- /dev/null
+++ b/qa/suites/fs/bugs/conf
@@ -0,0 +1 @@
+.qa/cephfs/conf
\ No newline at end of file

diff --git a/qa/suites/fs/multiclient/conf b/qa/suites/fs/multiclient/conf
new file mode 120000 (symlink)
index 0000000..16e8cc4
--- /dev/null
+++ b/qa/suites/fs/multiclient/conf
@@ -0,0 +1 @@
+.qa/cephfs/conf
\ No newline at end of file

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

diff --git a/qa/suites/fs/multifs/conf b/qa/suites/fs/multifs/conf
new file mode 120000 (symlink)
index 0000000..16e8cc4
--- /dev/null
+++ b/qa/suites/fs/multifs/conf
@@ -0,0 +1 @@
+.qa/cephfs/conf
\ No newline at end of file

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

diff --git a/qa/suites/fs/permission/conf b/qa/suites/fs/permission/conf
new file mode 120000 (symlink)
index 0000000..16e8cc4
--- /dev/null
+++ b/qa/suites/fs/permission/conf
@@ -0,0 +1 @@
+.qa/cephfs/conf
\ No newline at end of file

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

diff --git a/qa/suites/fs/snaps/conf b/qa/suites/fs/snaps/conf
new file mode 120000 (symlink)
index 0000000..16e8cc4
--- /dev/null
+++ b/qa/suites/fs/snaps/conf
@@ -0,0 +1 @@
+.qa/cephfs/conf
\ No newline at end of file

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

diff --git a/qa/suites/fs/thrash/conf b/qa/suites/fs/thrash/conf
new file mode 120000 (symlink)
index 0000000..16e8cc4
--- /dev/null
+++ b/qa/suites/fs/thrash/conf
@@ -0,0 +1 @@
+.qa/cephfs/conf
\ No newline at end of file

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

diff --git a/qa/suites/fs/traceless/conf b/qa/suites/fs/traceless/conf
new file mode 120000 (symlink)
index 0000000..16e8cc4
--- /dev/null
+++ b/qa/suites/fs/traceless/conf
@@ -0,0 +1 @@
+.qa/cephfs/conf
\ No newline at end of file

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

diff --git a/qa/suites/fs/verify/conf b/qa/suites/fs/verify/conf
new file mode 120000 (symlink)
index 0000000..16e8cc4
--- /dev/null
+++ b/qa/suites/fs/verify/conf
@@ -0,0 +1 @@
+.qa/cephfs/conf
\ No newline at end of file

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

diff --git a/qa/suites/kcephfs/cephfs/conf b/qa/suites/kcephfs/cephfs/conf
new file mode 120000 (symlink)
index 0000000..16e8cc4
--- /dev/null
+++ b/qa/suites/kcephfs/cephfs/conf
@@ -0,0 +1 @@
+.qa/cephfs/conf
\ No newline at end of file

diff --git a/qa/suites/kcephfs/cephfs/conf.yaml b/qa/suites/kcephfs/cephfs/conf.yaml
deleted file mode 100644 (file)
index b3ef404..0000000
--- a/qa/suites/kcephfs/cephfs/conf.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      global:
-        ms die on skipped message: false
-      mds:
-        debug mds: 20

diff --git a/qa/suites/kcephfs/cephfs/overrides/debug.yaml b/qa/suites/kcephfs/cephfs/overrides/debug.yaml
deleted file mode 120000 (symlink)
index 9bc8eb1..0000000
--- a/qa/suites/kcephfs/cephfs/overrides/debug.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../cephfs/overrides/debug.yaml
\ No newline at end of file

diff --git a/qa/suites/kcephfs/cephfs/overrides/ms-die-on-skipped.yaml b/qa/suites/kcephfs/cephfs/overrides/ms-die-on-skipped.yaml
new file mode 100644 (file)
index 0000000..30da870
--- /dev/null
+++ b/qa/suites/kcephfs/cephfs/overrides/ms-die-on-skipped.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      global:
+        ms die on skipped message: false

diff --git a/qa/suites/kcephfs/mixed-clients/conf b/qa/suites/kcephfs/mixed-clients/conf
new file mode 120000 (symlink)
index 0000000..16e8cc4
--- /dev/null
+++ b/qa/suites/kcephfs/mixed-clients/conf
@@ -0,0 +1 @@
+.qa/cephfs/conf
\ No newline at end of file

diff --git a/qa/suites/kcephfs/mixed-clients/conf.yaml b/qa/suites/kcephfs/mixed-clients/conf.yaml
deleted file mode 100644 (file)
index 75b8558..0000000
--- a/qa/suites/kcephfs/mixed-clients/conf.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      global:
-        ms die on skipped message: false
-      mds:
-        debug mds: 20
\ No newline at end of file

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

diff --git a/qa/suites/kcephfs/mixed-clients/overrides/ms-die-on-skipped.yaml b/qa/suites/kcephfs/mixed-clients/overrides/ms-die-on-skipped.yaml
new file mode 100644 (file)
index 0000000..30da870
--- /dev/null
+++ b/qa/suites/kcephfs/mixed-clients/overrides/ms-die-on-skipped.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      global:
+        ms die on skipped message: false

diff --git a/qa/suites/kcephfs/recovery/conf b/qa/suites/kcephfs/recovery/conf
new file mode 120000 (symlink)
index 0000000..16e8cc4
--- /dev/null
+++ b/qa/suites/kcephfs/recovery/conf
@@ -0,0 +1 @@
+.qa/cephfs/conf
\ No newline at end of file

diff --git a/qa/suites/kcephfs/recovery/debug/mds_client.yaml b/qa/suites/kcephfs/recovery/debug/mds_client.yaml
deleted file mode 100644 (file)
index 76cc4d8..0000000
--- a/qa/suites/kcephfs/recovery/debug/mds_client.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      mds:
-        debug ms: 1
-        debug mds: 20
-      client.0:
-        debug ms: 1
-        debug client: 20
-      client.1:
-        debug ms: 1
-        debug client: 20

diff --git a/qa/suites/kcephfs/recovery/overrides/debug.yaml b/qa/suites/kcephfs/recovery/overrides/debug.yaml
deleted file mode 120000 (symlink)
index 9bc8eb1..0000000
--- a/qa/suites/kcephfs/recovery/overrides/debug.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../cephfs/overrides/debug.yaml
\ No newline at end of file

diff --git a/qa/suites/kcephfs/thrash/conf b/qa/suites/kcephfs/thrash/conf
new file mode 120000 (symlink)
index 0000000..16e8cc4
--- /dev/null
+++ b/qa/suites/kcephfs/thrash/conf
@@ -0,0 +1 @@
+.qa/cephfs/conf
\ No newline at end of file

diff --git a/qa/suites/kcephfs/thrash/conf.yaml b/qa/suites/kcephfs/thrash/conf.yaml
deleted file mode 100644 (file)
index 75b8558..0000000
--- a/qa/suites/kcephfs/thrash/conf.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      global:
-        ms die on skipped message: false
-      mds:
-        debug mds: 20
\ No newline at end of file

diff --git a/qa/suites/kcephfs/thrash/overrides/debug.yaml b/qa/suites/kcephfs/thrash/overrides/debug.yaml
deleted file mode 120000 (symlink)
index 9bc8eb1..0000000
--- a/qa/suites/kcephfs/thrash/overrides/debug.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../cephfs/overrides/debug.yaml
\ No newline at end of file

diff --git a/qa/suites/kcephfs/thrash/overrides/ms-die-on-skipped.yaml b/qa/suites/kcephfs/thrash/overrides/ms-die-on-skipped.yaml
new file mode 100644 (file)
index 0000000..30da870
--- /dev/null
+++ b/qa/suites/kcephfs/thrash/overrides/ms-die-on-skipped.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      global:
+        ms die on skipped message: false

diff --git a/qa/suites/multimds/basic/conf b/qa/suites/multimds/basic/conf
new file mode 120000 (symlink)
index 0000000..16e8cc4
--- /dev/null
+++ b/qa/suites/multimds/basic/conf
@@ -0,0 +1 @@
+.qa/cephfs/conf
\ No newline at end of file

diff --git a/qa/suites/multimds/basic/tasks/cfuse_workunit_suites_pjd.yaml b/qa/suites/multimds/basic/tasks/cfuse_workunit_suites_pjd.yaml
index 7cb0b0f6e6bf27a1a1f10a01a8734a5d147b5a82..a1e2ada19e995b5916b8f63edf31a05ba55862c5 100644 (file)
--- a/qa/suites/multimds/basic/tasks/cfuse_workunit_suites_pjd.yaml
+++ b/qa/suites/multimds/basic/tasks/cfuse_workunit_suites_pjd.yaml
@@ -2,13 +2,8 @@ overrides:
   ceph:
     conf:
       client:
-        debug ms: 1
-        debug client: 20
         fuse set user groups: true
         fuse default permissions: false
-      mds:
-        debug ms: 1
-        debug mds: 20
 tasks:
 - workunit:
     clients:

diff --git a/qa/suites/multimds/thrash/conf b/qa/suites/multimds/thrash/conf
new file mode 120000 (symlink)
index 0000000..16e8cc4
--- /dev/null
+++ b/qa/suites/multimds/thrash/conf
@@ -0,0 +1 @@
+.qa/cephfs/conf
\ No newline at end of file

diff --git a/qa/suites/multimds/verify/conf b/qa/suites/multimds/verify/conf
new file mode 120000 (symlink)
index 0000000..16e8cc4
--- /dev/null
+++ b/qa/suites/multimds/verify/conf
@@ -0,0 +1 @@
+.qa/cephfs/conf
\ No newline at end of file