qa/suites/fs/upgrade: set pg_autoscale_mode=off after upgrade

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

diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml
index 5b1399035e875f6e93a33518ee69e3529ffd6df5..3c7f33d92e924ea2cd68097ac29431985db37855 100644 (file)
--- a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml
+++ b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml
@@ -30,6 +30,7 @@ tasks:
     wait-for-healthy: false
 - exec:
     mon.a:
+      - ceph osd require-osd-release octopus
       - ceph config set global mon_warn_on_msgr2_not_enabled false
 - ceph.healthy:
 - ceph.restart:
@@ -45,6 +46,7 @@ tasks:
     mon.a:
     - ceph mon enable-msgr2
     - ceph config rm global mon_warn_on_msgr2_not_enabled
+    - for f in `ceph osd pool ls` ; do ceph osd pool set $f pg_autoscale_mode off ; done
 - exec:
     mon.a:
     - ceph osd dump -f json-pretty

diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml
index 5b1399035e875f6e93a33518ee69e3529ffd6df5..a35291e2986bd0d44a4ca60ed0d3e78ba817fbeb 100644 (file)
--- a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml
+++ b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml
@@ -43,8 +43,10 @@ tasks:
     wait-for-osds-up: true
 - exec:
     mon.a:
+    - ceph osd require-osd-release octopus
     - ceph mon enable-msgr2
     - ceph config rm global mon_warn_on_msgr2_not_enabled
+    - for f in `ceph osd pool ls` ; do ceph osd pool set $f pg_autoscale_mode off ; done
 - exec:
     mon.a:
     - ceph osd dump -f json-pretty