Merge PR #32853 into master

* refs/pull/32853/head:
	qa/suites/fs/upgrade: finish at octopus
	qa/suites/fs/upgrade: set min-compat-client to octopus
	qa/suites/fs/upgrade: set pg_autoscale_mode=off after upgrade

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
This commit is contained in:
Sage Weil 2020-01-27 07:14:37 -06:00
commit 05cc0d8c70
6 changed files with 10 additions and 14 deletions

View File

@ -36,6 +36,5 @@ tasks:
ms bind msgr2: false
- exec:
osd.0:
- ceph osd require-osd-release mimic
- ceph osd set-require-min-compat-client mimic
- print: "**** done ceph"

View File

@ -41,15 +41,14 @@ tasks:
daemons: [mds.*]
wait-for-healthy: false
wait-for-osds-up: true
- exec:
mon.a:
- ceph mon enable-msgr2
- ceph config rm global mon_warn_on_msgr2_not_enabled
- exec:
mon.a:
- ceph osd dump -f json-pretty
- ceph versions
- ceph osd require-osd-release nautilus
- ceph mon enable-msgr2
- ceph config rm global mon_warn_on_msgr2_not_enabled
- ceph osd require-osd-release octopus
- for f in `ceph osd pool ls` ; do ceph osd pool set $f pg_autoscale_mode off ; done
#- ceph osd set-require-min-compat-client nautilus
- ceph.healthy:
- print: "**** done ceph.restart"

View File

@ -6,5 +6,5 @@ tasks:
- exec:
mon.a:
- ceph fs dump --format=json-pretty
- ceph fs set cephfs min_compat_client nautilus
- ceph fs set cephfs min_compat_client octopus
- fs.clients_evicted:

View File

@ -36,6 +36,5 @@ tasks:
ms bind msgr2: false
- exec:
osd.0:
- ceph osd require-osd-release mimic
- ceph osd set-require-min-compat-client mimic
- print: "**** done ceph"

View File

@ -44,12 +44,11 @@ tasks:
- exec:
mon.a:
- ceph mon enable-msgr2
- ceph config rm global mon_warn_on_msgr2_not_enabled
- exec:
mon.a:
- ceph osd dump -f json-pretty
- ceph versions
- ceph osd require-osd-release nautilus
- ceph osd dump -f json-pretty
- ceph config rm global mon_warn_on_msgr2_not_enabled
- ceph osd require-osd-release octopus
- for f in `ceph osd pool ls` ; do ceph osd pool set $f pg_autoscale_mode off ; done
#- ceph osd set-require-min-compat-client nautilus
- ceph.healthy:
- print: "**** done ceph.restart"

View File

@ -6,7 +6,7 @@ tasks:
- exec:
mon.a:
- ceph fs dump --format=json-pretty
- ceph fs set cephfs min_compat_client nautilus
- ceph fs set cephfs min_compat_client octopus
- fs.clients_evicted:
clients:
client.0: False