Merge pull request #23877 from smithfarm/wip-24842-luminous

luminous: qa: move mds/client config to qa from teuthology ceph.conf.template Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
ceph · Oct 3, 2018 · 2c73ec0 · 2c73ec0
2 parents 336ae60 + 64086a1
commit 2c73ec0
Show file tree

Hide file tree

Showing 48 changed files with 40 additions and 65 deletions.
diff --git a/qa/cephfs/conf/+ b/qa/cephfs/conf/+
diff --git a/qa/cephfs/overrides/debug.yaml → qa/cephfs/conf/client.yaml b/qa/cephfs/overrides/debug.yaml → qa/cephfs/conf/client.yaml
@@ -1,9 +1,7 @@
 overrides:
   ceph:
     conf:
-      mds:
-        debug ms: 1
-        debug mds: 20
       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
@@ -0,0 +1,11 @@
+overrides:
+  ceph:
+    conf:
+      mds:
+        debug mds: 20
+        debug ms: 1
+        mds debug frag: true
+        mds debug scatterstat: true
+        mds op complaint time: 180
+        mds verify scatter: true
+        osd op complaint time: 180
diff --git a/qa/cephfs/conf/mon.yaml b/qa/cephfs/conf/mon.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      mon:
+        mon op complaint time: 120
diff --git a/qa/cephfs/conf/osd.yaml b/qa/cephfs/conf/osd.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      osd:
+        osd op complaint time: 180
diff --git 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
@@ -0,0 +1 @@
+.qa/cephfs/conf
diff --git a/qa/suites/fs/32bits/overrides/debug.yaml b/qa/suites/fs/32bits/overrides/debug.yaml
diff --git a/qa/suites/fs/basic_functional/conf b/qa/suites/fs/basic_functional/conf
@@ -0,0 +1 @@
+.qa/cephfs/conf
diff --git a/qa/suites/fs/basic_functional/overrides/debug.yaml b/qa/suites/fs/basic_functional/overrides/debug.yaml
diff --git a/qa/suites/fs/basic_workload/conf b/qa/suites/fs/basic_workload/conf
@@ -0,0 +1 @@
+.qa/cephfs/conf
diff --git a/qa/suites/fs/basic_workload/overrides/debug.yaml b/qa/suites/fs/basic_workload/overrides/debug.yaml
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
@@ -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
diff --git a/qa/suites/fs/bugs/conf b/qa/suites/fs/bugs/conf
@@ -0,0 +1 @@
+.qa/cephfs/conf
diff --git a/qa/suites/fs/multiclient/conf b/qa/suites/fs/multiclient/conf
@@ -0,0 +1 @@
+.qa/cephfs/conf
diff --git a/qa/suites/fs/multiclient/overrides/debug.yaml b/qa/suites/fs/multiclient/overrides/debug.yaml
diff --git a/qa/suites/fs/multifs/conf b/qa/suites/fs/multifs/conf
@@ -0,0 +1 @@
+.qa/cephfs/conf
diff --git a/qa/suites/fs/multifs/overrides/debug.yaml b/qa/suites/fs/multifs/overrides/debug.yaml
diff --git a/qa/suites/fs/permission/conf b/qa/suites/fs/permission/conf
@@ -0,0 +1 @@
+.qa/cephfs/conf
diff --git a/qa/suites/fs/permission/overrides/debug.yaml b/qa/suites/fs/permission/overrides/debug.yaml
diff --git a/qa/suites/fs/snaps/conf b/qa/suites/fs/snaps/conf
@@ -0,0 +1 @@
+.qa/cephfs/conf
diff --git a/qa/suites/fs/snaps/overrides/debug.yaml b/qa/suites/fs/snaps/overrides/debug.yaml
diff --git a/qa/suites/fs/thrash/conf b/qa/suites/fs/thrash/conf
@@ -0,0 +1 @@
+.qa/cephfs/conf
diff --git a/qa/suites/fs/thrash/overrides/debug.yaml b/qa/suites/fs/thrash/overrides/debug.yaml
diff --git a/qa/suites/fs/traceless/conf b/qa/suites/fs/traceless/conf
@@ -0,0 +1 @@
+.qa/cephfs/conf
diff --git a/qa/suites/fs/traceless/overrides/debug.yaml b/qa/suites/fs/traceless/overrides/debug.yaml
diff --git a/qa/suites/fs/verify/conf b/qa/suites/fs/verify/conf
@@ -0,0 +1 @@
+.qa/cephfs/conf
diff --git a/qa/suites/fs/verify/overrides/debug.yaml b/qa/suites/fs/verify/overrides/debug.yaml
diff --git a/qa/suites/kcephfs/cephfs/conf b/qa/suites/kcephfs/cephfs/conf
@@ -0,0 +1 @@
+.qa/cephfs/conf
diff --git a/qa/suites/kcephfs/cephfs/overrides/debug.yaml b/qa/suites/kcephfs/cephfs/overrides/debug.yaml
diff --git a/qa/suites/kcephfs/mixed-clients/conf.yaml → ...s/cephfs/overrides/ms-die-on-skipped.yaml b/qa/suites/kcephfs/mixed-clients/conf.yaml → ...s/cephfs/overrides/ms-die-on-skipped.yaml
@@ -3,5 +3,3 @@ overrides:
     conf:
       global:
         ms die on skipped message: false
-      mds:
-        debug mds: 20
diff --git a/qa/suites/kcephfs/mixed-clients/conf b/qa/suites/kcephfs/mixed-clients/conf
@@ -0,0 +1 @@
+.qa/cephfs/conf
diff --git a/qa/suites/kcephfs/mixed-clients/overrides/debug.yaml b/qa/suites/kcephfs/mixed-clients/overrides/debug.yaml
diff --git a/qa/suites/kcephfs/thrash/conf.yaml → ...-clients/overrides/ms-die-on-skipped.yaml b/qa/suites/kcephfs/thrash/conf.yaml → ...-clients/overrides/ms-die-on-skipped.yaml
@@ -3,5 +3,3 @@ overrides:
     conf:
       global:
         ms die on skipped message: false
-      mds:
-        debug mds: 20
diff --git a/qa/suites/kcephfs/recovery/conf b/qa/suites/kcephfs/recovery/conf
@@ -0,0 +1 @@
+.qa/cephfs/conf
diff --git a/qa/suites/kcephfs/recovery/debug/.qa b/qa/suites/kcephfs/recovery/debug/.qa
diff --git a/qa/suites/kcephfs/recovery/debug/mds_client.yaml b/qa/suites/kcephfs/recovery/debug/mds_client.yaml
diff --git a/qa/suites/kcephfs/recovery/dirfrag/.qa b/qa/suites/kcephfs/recovery/dirfrag/.qa
diff --git a/qa/suites/kcephfs/recovery/dirfrag/frag_enable.yaml b/qa/suites/kcephfs/recovery/dirfrag/frag_enable.yaml
diff --git a/qa/suites/kcephfs/recovery/overrides/debug.yaml b/qa/suites/kcephfs/recovery/overrides/debug.yaml
diff --git a/qa/suites/kcephfs/thrash/conf b/qa/suites/kcephfs/thrash/conf
@@ -0,0 +1 @@
+.qa/cephfs/conf
diff --git a/qa/suites/kcephfs/thrash/overrides/debug.yaml b/qa/suites/kcephfs/thrash/overrides/debug.yaml
diff --git a/qa/suites/kcephfs/cephfs/conf.yaml → ...s/thrash/overrides/ms-die-on-skipped.yaml b/qa/suites/kcephfs/cephfs/conf.yaml → ...s/thrash/overrides/ms-die-on-skipped.yaml
@@ -3,5 +3,3 @@ overrides:
     conf:
       global:
         ms die on skipped message: false
-      mds:
-        debug mds: 20
diff --git a/qa/suites/multimds/basic/conf b/qa/suites/multimds/basic/conf
@@ -0,0 +1 @@
+.qa/cephfs/conf
diff --git 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
@@ -0,0 +1 @@
+.qa/cephfs/conf
diff --git a/qa/suites/multimds/verify/conf b/qa/suites/multimds/verify/conf
@@ -0,0 +1 @@
+.qa/cephfs/conf