From: Sage Weil <sage@redhat.com>
Date: Thu, 6 Feb 2020 23:52:40 +0000 (-0600)
Subject: qa/suites/upgrade/nautilus-x-singleton: ensure hit sets behave across upgrade
X-Git-Tag: v15.1.1~494^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cbeb24323aa4d2c1e58e5f18d10f4ec32982c980;p=ceph.git

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 c9bcbbc906d2..08133fe349d3 100644
--- 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 e7fa4b2f47c6..a4ea0965588c 100644
--- 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