qa/suites/upgrade/nautilus-x-singleton: ensure hit sets behave across upgrade

Create a pool that generates hit sets before the upgrade, and ensure that
they (continue to) trim after the upgrade.

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

diff --git a/qa/suites/upgrade/nautilus-x-singleton/1-install/nautilus.yaml b/qa/suites/upgrade/nautilus-x-singleton/1-install/nautilus.yaml
index c9bcbbc906d20f0d503640db31cff37b4c1b5658..08133fe349d3ad2ca54a8370eea8b56c2ddf1d61 100644 (file)
--- a/qa/suites/upgrade/nautilus-x-singleton/1-install/nautilus.yaml
+++ b/qa/suites/upgrade/nautilus-x-singleton/1-install/nautilus.yaml
@@ -15,3 +15,14 @@ tasks:
 - print: "**** done install nautilus"
 - ceph:
 - print: "**** done ceph"
+
+# create a hit set test pool that will generate hit sets prior to octopus
+- exec:
+    mon.a:
+      - sudo ceph osd pool create test-hit-set-base 32
+      - sudo ceph osd pool create test-hit-set-cache 32
+      - sudo ceph osd tier add test-hit-set-base test-hit-set-cache
+      - sudo ceph osd pool set test-hit-set-cache hit_set_type bloom
+      - sudo ceph osd pool set test-hit-set-cache hit_set_count 32
+      - sudo ceph osd pool set test-hit-set-cache hit_set_period 15
+      - rados -p test-hit-set-cache bench 30 write -b 1

diff --git a/qa/suites/upgrade/nautilus-x-singleton/6-finish-upgrade.yaml b/qa/suites/upgrade/nautilus-x-singleton/6-finish-upgrade.yaml
index e7fa4b2f47c6fcbd2a1612f802f11d111a823be1..a4ea0965588cec78af45381832ee6b75bd6f22e5 100644 (file)
--- a/qa/suites/upgrade/nautilus-x-singleton/6-finish-upgrade.yaml
+++ b/qa/suites/upgrade/nautilus-x-singleton/6-finish-upgrade.yaml
@@ -28,3 +28,10 @@ tasks:
       - ceph mon enable-msgr2
 - install.upgrade:
     client.0:
+
+# reduce canary pool hit set count from 32 -> 4 and do some io so that
+# we are sure they will be trimmed post-upgrade.
+- exec:
+    mon.a:
+      - sudo ceph osd pool set test-hit-set-cache hit_set_count 4
+      - rados -p test-hit-set-cache bench 5 write -b 1