From: Sage Weil <sage@redhat.com>
Date: Fri, 24 Jan 2020 23:24:39 +0000 (-0600)
Subject: qa/suites/fs/upgrade: set pg_autoscale_mode=off after upgrade
X-Git-Tag: v15.1.0~43^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=41c03aa1439d7772287744b27287b95c621a0f3a;p=ceph.git

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 5b1399035e87..3c7f33d92e92 100644
--- 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 5b1399035e87..a35291e2986b 100644
--- 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