qa/suites/rados/thrash: combine balancer with require-luminous

We can only do the balancer stuff if we've done the mkfs-time
require luminous because otherwise the mgr commands aren't proxied via
the mon.

Only do balancer for thrash tests; not for basic, monthrash, verify.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/qa/suites/rados/basic/d-require-luminous b/qa/suites/rados/basic/d-require-luminous
deleted file mode 120000 (symlink)
index 737aee8..0000000
--- a/qa/suites/rados/basic/d-require-luminous
+++ /dev/null
@@ -1 +0,0 @@
-../thrash/d-require-luminous/
\ No newline at end of file

diff --git a/qa/suites/rados/basic/d-require-luminous/at-end.yaml b/qa/suites/rados/basic/d-require-luminous/at-end.yaml
new file mode 100644 (file)
index 0000000..ef998cc
--- /dev/null
+++ b/qa/suites/rados/basic/d-require-luminous/at-end.yaml
@@ -0,0 +1,33 @@
+# do not require luminous osds at mkfs time; only set flag at
+# the end of the test run, then do a final scrub (to convert any
+# legacy snapsets), and verify we are healthy.
+tasks:
+- full_sequential_finally:
+  - exec:
+      mon.a:
+        - ceph osd require-osd-release luminous
+        - ceph osd pool application enable base rados || true
+# make sure osds have latest map
+        - rados -p rbd bench 5 write -b 4096
+  - ceph.healthy:
+  - ceph.osd_scrub_pgs:
+      cluster: ceph
+  - exec:
+      mon.a:
+        - sleep 15
+        - ceph osd dump | grep purged_snapdirs
+        - ceph pg dump -f json-pretty
+        - "ceph pg dump sum -f json-pretty | grep num_legacy_snapsets | head -1 | grep ': 0'"
+overrides:
+  ceph:
+    conf:
+      global:
+        mon debug no require luminous: true
+
+# setting luminous triggers peering, which *might* trigger health alerts
+    log-whitelist:
+      - overall HEALTH_
+      - \(PG_AVAILABILITY\)
+      - \(PG_DEGRADED\)
+  thrashosds:
+    chance_thrash_cluster_full: 0

diff --git a/qa/suites/rados/basic/d-require-luminous/at-mkfs.yaml b/qa/suites/rados/basic/d-require-luminous/at-mkfs.yaml
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/suites/rados/monthrash/d-require-luminous b/qa/suites/rados/monthrash/d-require-luminous
index 737aee82415f31688760885f520671a2a8724d70..82036c67f956fbc63231904b49a2b6642420b712 120000 (symlink)
--- a/qa/suites/rados/monthrash/d-require-luminous
+++ b/qa/suites/rados/monthrash/d-require-luminous
@@ -1 +1 @@
-../thrash/d-require-luminous/
\ No newline at end of file
+../basic/d-require-luminous
\ No newline at end of file

diff --git a/qa/suites/rados/thrash/d-balancer/crush-compat.yaml b/qa/suites/rados/thrash/d-balancer/crush-compat.yaml
deleted file mode 100644 (file)
index aa86766..0000000
--- a/qa/suites/rados/thrash/d-balancer/crush-compat.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- exec:
-    mon.a:
-      - while ! ceph balancer status ; do sleep 1 ; done
-      - ceph balancer mode crush-compat
-      - ceph balancer on

diff --git a/qa/suites/rados/thrash/d-balancer/off.yaml b/qa/suites/rados/thrash/d-balancer/off.yaml
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/qa/suites/rados/thrash/d-balancer/upmap.yaml b/qa/suites/rados/thrash/d-balancer/upmap.yaml
deleted file mode 100644 (file)
index 417544a..0000000
--- a/qa/suites/rados/thrash/d-balancer/upmap.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- exec:
-    mon.a:
-      - while ! ceph balancer status ; do sleep 1 ; done
-      - ceph balancer mode upmap
-      - ceph balancer on

diff --git a/qa/suites/rados/thrash/d-require-luminous/at-mkfs-balancer-crush-compat.yaml b/qa/suites/rados/thrash/d-require-luminous/at-mkfs-balancer-crush-compat.yaml
new file mode 100644 (file)
index 0000000..aa86766
--- /dev/null
+++ b/qa/suites/rados/thrash/d-require-luminous/at-mkfs-balancer-crush-compat.yaml
@@ -0,0 +1,6 @@
+tasks:
+- exec:
+    mon.a:
+      - while ! ceph balancer status ; do sleep 1 ; done
+      - ceph balancer mode crush-compat
+      - ceph balancer on

diff --git a/qa/suites/rados/thrash/d-require-luminous/at-mkfs-balancer-upmap.yaml b/qa/suites/rados/thrash/d-require-luminous/at-mkfs-balancer-upmap.yaml
new file mode 100644 (file)
index 0000000..417544a
--- /dev/null
+++ b/qa/suites/rados/thrash/d-require-luminous/at-mkfs-balancer-upmap.yaml
@@ -0,0 +1,6 @@
+tasks:
+- exec:
+    mon.a:
+      - while ! ceph balancer status ; do sleep 1 ; done
+      - ceph balancer mode upmap
+      - ceph balancer on

diff --git a/qa/suites/rados/verify/d-require-luminous b/qa/suites/rados/verify/d-require-luminous
index 737aee82415f31688760885f520671a2a8724d70..82036c67f956fbc63231904b49a2b6642420b712 120000 (symlink)
--- a/qa/suites/rados/verify/d-require-luminous
+++ b/qa/suites/rados/verify/d-require-luminous
@@ -1 +1 @@
-../thrash/d-require-luminous/
\ No newline at end of file
+../basic/d-require-luminous
\ No newline at end of file