From: Sage Weil <sage@redhat.com>
Date: Tue, 25 Apr 2017 17:05:33 +0000 (-0400)
Subject: qa/suites/upgarde/jewel-x: add final scrub and legacy snapset check
X-Git-Tag: v12.0.3~28^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=73f8fb9976a2749fcb3d795a457cfc617cb25668;p=ceph.git

qa/suites/upgarde/jewel-x: add final scrub and legacy snapset check

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

diff --git a/qa/suites/upgrade/jewel-x/parallel/1.5-final-scrub.yaml b/qa/suites/upgrade/jewel-x/parallel/1.5-final-scrub.yaml
new file mode 100644
index 000000000000..83457c0166d4
--- /dev/null
+++ b/qa/suites/upgrade/jewel-x/parallel/1.5-final-scrub.yaml
@@ -0,0 +1,11 @@
+# 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:
+  - ceph.osd_scrub_pgs:
+      cluster: ceph
+  - exec:
+      mon.a:
+        - ceph pg dump -f json-pretty
+        - "ceph pg dump sum -f json-pretty | grep num_legacy_snapsets | head -1 | grep ': 0'"
diff --git a/qa/suites/upgrade/jewel-x/stress-split-erasure-code/1.5-final-scrub.yaml b/qa/suites/upgrade/jewel-x/stress-split-erasure-code/1.5-final-scrub.yaml
new file mode 120000
index 000000000000..522db1b80a6b
--- /dev/null
+++ b/qa/suites/upgrade/jewel-x/stress-split-erasure-code/1.5-final-scrub.yaml
@@ -0,0 +1 @@
+../parallel/1.5-final-scrub.yaml
\ No newline at end of file
diff --git a/qa/suites/upgrade/jewel-x/stress-split/1.5-final-scrub.yaml b/qa/suites/upgrade/jewel-x/stress-split/1.5-final-scrub.yaml
new file mode 120000
index 000000000000..522db1b80a6b
--- /dev/null
+++ b/qa/suites/upgrade/jewel-x/stress-split/1.5-final-scrub.yaml
@@ -0,0 +1 @@
+../parallel/1.5-final-scrub.yaml
\ No newline at end of file