qa: synchronize kcephfs suites with fs/multimds

Fixes: http://tracker.ceph.com/issues/22627
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

diff --git a/qa/cephfs/clusters/1-mds-1-client.yaml b/qa/cephfs/clusters/1-mds-1-client.yaml
new file mode 100644 (file)
index 0000000..e64b0b8
--- /dev/null
+++ b/qa/cephfs/clusters/1-mds-1-client.yaml
@@ -0,0 +1,8 @@
+roles:
+- [mon.a, mgr.y, mds.a, osd.0, osd.1, osd.2, osd.3]
+- [mon.b, mon.c, mgr.x, mds.a-s, osd.4, osd.5, osd.6, osd.7]
+- [client.0]
+openstack:
+- volumes: # attached to each instance
+    count: 4
+    size: 10 # GB

diff --git a/qa/cephfs/clusters/1-mds-2-client.yaml b/qa/cephfs/clusters/1-mds-2-client.yaml
new file mode 100644 (file)
index 0000000..006e15a
--- /dev/null
+++ b/qa/cephfs/clusters/1-mds-2-client.yaml
@@ -0,0 +1,9 @@
+roles:
+- [mon.a, mgr.y, mds.a, osd.0, osd.1, osd.2, osd.3]
+- [mon.b, mon.c, mgr.x, mds.a-s, osd.4, osd.5, osd.6, osd.7]
+- [client.0]
+- [client.1]
+openstack:
+- volumes: # attached to each instance
+    count: 4
+    size: 10 # GB

diff --git a/qa/cephfs/clusters/1-mds-4-client.yaml b/qa/cephfs/clusters/1-mds-4-client.yaml
new file mode 100644 (file)
index 0000000..a6be36d
--- /dev/null
+++ b/qa/cephfs/clusters/1-mds-4-client.yaml
@@ -0,0 +1,11 @@
+roles:
+- [mon.a, mgr.y, mds.a, osd.0, osd.1, osd.2, osd.3]
+- [mon.b, mon.c, mgr.x, mds.a-s, osd.4, osd.5, osd.6, osd.7]
+- [client.0]
+- [client.1]
+- [client.2]
+- [client.3]
+openstack:
+- volumes: # attached to each instance
+    count: 4
+    size: 10 # GB

diff --git a/qa/cephfs/overrides/log-config.yaml b/qa/cephfs/overrides/log-config.yaml
new file mode 100644 (file)
index 0000000..3b876f1
--- /dev/null
+++ b/qa/cephfs/overrides/log-config.yaml
@@ -0,0 +1,3 @@
+log-rotate:
+  ceph-mds: 10G
+  ceph-osd: 10G

diff --git a/qa/cephfs/overrides/osd-asserts.yaml b/qa/cephfs/overrides/osd-asserts.yaml
new file mode 100644 (file)
index 0000000..8c16e6e
--- /dev/null
+++ b/qa/cephfs/overrides/osd-asserts.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      osd:
+        osd shutdown pgref assert: true

diff --git a/qa/suites/kcephfs/cephfs/clusters/1-mds-1-client.yaml b/qa/suites/kcephfs/cephfs/clusters/1-mds-1-client.yaml
new file mode 120000 (symlink)
index 0000000..260d3e9
--- /dev/null
+++ b/qa/suites/kcephfs/cephfs/clusters/1-mds-1-client.yaml
@@ -0,0 +1 @@
+../../../../cephfs/clusters/1-mds-1-client.yaml
\ No newline at end of file

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

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

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

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

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

diff --git a/qa/suites/kcephfs/cephfs/overrides/osd-asserts.yaml b/qa/suites/kcephfs/cephfs/overrides/osd-asserts.yaml
new file mode 120000 (symlink)
index 0000000..6b07e51
--- /dev/null
+++ b/qa/suites/kcephfs/cephfs/overrides/osd-asserts.yaml
@@ -0,0 +1 @@
+../../../../cephfs/overrides/osd-asserts.yaml
\ No newline at end of file

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

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

diff --git a/qa/suites/kcephfs/mixed-clients/clusters/1-mds-2-client.yaml b/qa/suites/kcephfs/mixed-clients/clusters/1-mds-2-client.yaml
new file mode 120000 (symlink)
index 0000000..fb64224
--- /dev/null
+++ b/qa/suites/kcephfs/mixed-clients/clusters/1-mds-2-client.yaml
@@ -0,0 +1 @@
+../../../../cephfs/clusters/1-mds-2-client.yaml
\ No newline at end of file

diff --git a/qa/suites/kcephfs/mixed-clients/clusters/2-clients.yaml b/qa/suites/kcephfs/mixed-clients/clusters/2-clients.yaml
deleted file mode 100644 (file)
index 90b6cf6..0000000
--- a/qa/suites/kcephfs/mixed-clients/clusters/2-clients.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-roles:
-- [mon.a, mgr.x, mds.a, osd.0, osd.1]
-- [mon.b, mon.c, osd.2, osd.3]
-- [client.0]
-- [client.1]
-openstack:
-- volumes: # attached to each instance
-    count: 2
-    size: 10 # GB

diff --git a/qa/suites/kcephfs/mixed-clients/overrides/+ b/qa/suites/kcephfs/mixed-clients/overrides/+
new file mode 100644 (file)
index 0000000..e69de29

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

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

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

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

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

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

diff --git a/qa/suites/kcephfs/recovery/clusters/1-mds-4-client.yaml b/qa/suites/kcephfs/recovery/clusters/1-mds-4-client.yaml
new file mode 120000 (symlink)
index 0000000..51fc2b8
--- /dev/null
+++ b/qa/suites/kcephfs/recovery/clusters/1-mds-4-client.yaml
@@ -0,0 +1 @@
+../../../../cephfs/clusters/1-mds-4-client.yaml
\ No newline at end of file

diff --git a/qa/suites/kcephfs/recovery/clusters/4-remote-clients.yaml b/qa/suites/kcephfs/recovery/clusters/4-remote-clients.yaml
deleted file mode 100644 (file)
index b1072e3..0000000
--- a/qa/suites/kcephfs/recovery/clusters/4-remote-clients.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-roles:
-- [mon.a, osd.0, osd.1, osd.2, osd.3, mds.a, mds.c, client.2]
-- [mgr.x, osd.4, osd.5, osd.6, osd.7, mds.b, mds.d, client.3]
-- [client.0]
-- [client.1]
-openstack:
-- volumes: # attached to each instance
-    count: 2
-    size: 10 # GB
-log-rotate:
-  ceph-mds: 10G
-  ceph-osd: 10G

diff --git a/qa/suites/kcephfs/recovery/overrides/+ b/qa/suites/kcephfs/recovery/overrides/+
new file mode 100644 (file)
index 0000000..e69de29

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

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

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

diff --git a/qa/suites/kcephfs/recovery/overrides/osd-asserts.yaml b/qa/suites/kcephfs/recovery/overrides/osd-asserts.yaml
new file mode 120000 (symlink)
index 0000000..6b07e51
--- /dev/null
+++ b/qa/suites/kcephfs/recovery/overrides/osd-asserts.yaml
@@ -0,0 +1 @@
+../../../../cephfs/overrides/osd-asserts.yaml
\ No newline at end of file

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

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

diff --git a/qa/suites/kcephfs/recovery/tasks/mds-full.yaml b/qa/suites/kcephfs/recovery/tasks/mds-full.yaml
index 558a206733775536d06402f37b44f05f8f1e0a9d..7320659c9986a35cf10137c9bd888af754612eb4 100644 (file)
--- a/qa/suites/kcephfs/recovery/tasks/mds-full.yaml
+++ b/qa/suites/kcephfs/recovery/tasks/mds-full.yaml
@@ -1,6 +1,8 @@
 
 overrides:
   ceph:
+    cephfs_ec_profile:
+      - disabled
     log-whitelist:
       - OSD full dropping all updates
       - OSD near full
@@ -8,10 +10,15 @@ overrides:
       - failsafe disengaged, no longer dropping
       - is full \(reached quota
     conf:
+      mon:
+        mon osd nearfull ratio: 0.6
+        mon osd backfillfull ratio: 0.6
+        mon osd full ratio: 0.7
       osd:
         osd mon report interval max: 5
         osd objectstore: memstore
-        memstore device bytes: 100000000
+        osd failsafe full ratio: 1.0
+        memstore device bytes: 200000000
 
 tasks:
   - cephfs_test_runner:

diff --git a/qa/suites/kcephfs/thrash/clusters/1-mds-1-client.yaml b/qa/suites/kcephfs/thrash/clusters/1-mds-1-client.yaml
new file mode 120000 (symlink)
index 0000000..260d3e9
--- /dev/null
+++ b/qa/suites/kcephfs/thrash/clusters/1-mds-1-client.yaml
@@ -0,0 +1 @@
+../../../../cephfs/clusters/1-mds-1-client.yaml
\ No newline at end of file

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

diff --git a/qa/suites/kcephfs/thrash/overrides/+ b/qa/suites/kcephfs/thrash/overrides/+
new file mode 100644 (file)
index 0000000..e69de29

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

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

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

diff --git a/qa/suites/kcephfs/thrash/overrides/osd-asserts.yaml b/qa/suites/kcephfs/thrash/overrides/osd-asserts.yaml
new file mode 120000 (symlink)
index 0000000..6b07e51
--- /dev/null
+++ b/qa/suites/kcephfs/thrash/overrides/osd-asserts.yaml
@@ -0,0 +1 @@
+../../../../cephfs/overrides/osd-asserts.yaml
\ No newline at end of file

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

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