RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-15 07:23:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

qa/cephadm: do not start upgrades from Octopus

Browse Source 
now that we officially have v18 in main the upgrade
will fail if upgrading from Octopus (v15) to main
because they are now considered 3 major releases apart

Additionally adding more debugging to the end
of the upgrade tests as something like `ceph health detail`
can be very useful to see at the end of failed
upgrade tests

Fixes: https://tracker.ceph.com/issues/57695

Signed-off-by: Adam King <adking@redhat.com>
This commit is contained in:
Adam King 2022-09-28 12:34:35 -04:00
parent b813183449
commit 80025d06d1
7 changed files with 18 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/5-upgrade-with-workload.yaml
View File

@ -15,8 +15,10 @@ upgrade-tasks:
- cephadm.shell:
env: [sha1]
host.a:
- while ceph orch upgrade status | jq '.in_progress' | grep true && ! ceph orch upgrade status | jq '.message' | grep Error ; do ceph orch ps ; ceph versions ; ceph fs dump; ceph orch upgrade status ; sleep 30 ; done
- while ceph orch upgrade status | jq '.in_progress' | grep true && ! ceph orch upgrade status | jq '.message' | grep Error ; do ceph orch ps ; ceph versions ; ceph fs dump; ceph orch upgrade status ; ceph health detail ; sleep 30 ; done
- ceph orch ps
- ceph orch upgrade status
- ceph health detail
- ceph versions
- echo "wait for servicemap items w/ changing names to refresh"
- sleep 60

6
qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/octopus.yaml → qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/16.2.0.yaml
View File

@ -1,8 +1,8 @@
tasks:
- cephadm:
roleless: true
image: quay.io/ceph/ceph:v15
cephadm_branch: octopus
image: quay.io/ceph/ceph:v16.2.0
cephadm_branch: v16.2.0
cephadm_git_url: https://github.com/ceph/ceph
# needed for v16.2.0 due to --skip-admin-label
avoid_pacific_features: true
add_mons_via_daemon_add: true

4
qa/suites/orch/cephadm/mgr-nfs-upgrade/3-upgrade-with-workload.yaml
View File

@ -16,12 +16,14 @@ upgrade-tasks:
- cephadm.shell:
env: [sha1]
host.a:
- while ceph orch upgrade status | jq '.in_progress' | grep true && ! ceph orch upgrade status | jq '.message' | grep Error ; do ceph orch ps ; ceph versions ; ceph orch upgrade status ; sleep 30 ; done
- while ceph orch upgrade status | jq '.in_progress' | grep true && ! ceph orch upgrade status | jq '.message' | grep Error ; do ceph orch ps ; ceph versions ; ceph orch upgrade status ; ceph health detail ; sleep 30 ; done
- ceph orch ps
- ceph versions
- echo "wait for servicemap items w/ changing names to refresh"
- sleep 60
- ceph orch ps
- ceph orch upgrade status
- ceph health detail
- ceph versions
- ceph versions | jq -e '.overall | length == 1'
- ceph versions | jq -e '.overall | keys' | grep $sha1

7
qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_8.stream_container-tools.yaml
View File

@ -9,8 +9,8 @@ tasks:
- sudo dnf -y module install container-tools
- sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf
- cephadm:
image: quay.io/ceph/ceph:v15.2.0
cephadm_branch: v15.2.0
image: quay.io/ceph/ceph:v16.2.0
cephadm_branch: v16.2.0
cephadm_git_url: https://github.com/ceph/ceph
# avoid --cap-add=PTRACE + --privileged for older cephadm versions
allow_ptrace: false
@ -27,7 +27,6 @@ roles:
- osd.2
- osd.3
- client.0
# - ceph.rgw.realm.zone.a # Disabled, needs 15.2.4 as an upgrade start
- node-exporter.a
- alertmanager.a
- - mon.b
@ -40,4 +39,4 @@ roles:
- prometheus.a
- grafana.a
- node-exporter.b
# - ceph.iscsi.iscsi.a # needs later start point
- ceph.iscsi.iscsi.a

37
qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04-15.2.9.yaml
View File

@ -1,37 +0,0 @@
os_type: ubuntu
os_version: "20.04"
tasks:
- cephadm:
image: quay.io/ceph/ceph:v15.2.9
cephadm_branch: v15.2.9
cephadm_git_url: https://github.com/ceph/ceph
# avoid --cap-add=PTRACE + --privileged for older cephadm versions
allow_ptrace: false
# deploy additional mons the "old" (octopus) way
add_mons_via_daemon_add: true
avoid_pacific_features: true
roles:
- - mon.a
- mon.c
- mgr.y
- osd.0
- osd.1
- osd.2
- osd.3
- client.0
# - ceph.rgw.realm.zone.a # CLI change in v16 pacific
- node-exporter.a
- alertmanager.a
- - mon.b
- mgr.x
- osd.4
- osd.5
- osd.6
- osd.7
- client.1
- prometheus.a
- grafana.a
- node-exporter.b
- ceph.iscsi.iscsi.a

7
qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml
View File

@ -3,8 +3,8 @@ os_version: "20.04"
tasks:
- cephadm:
image: quay.io/ceph/ceph:v15.2.0
cephadm_branch: v15.2.0
image: quay.io/ceph/ceph:v16.2.0
cephadm_branch: v16.2.0
cephadm_git_url: https://github.com/ceph/ceph
# avoid --cap-add=PTRACE + --privileged for older cephadm versions
allow_ptrace: false
@ -21,7 +21,6 @@ roles:
- osd.2
- osd.3
- client.0
# - ceph.rgw.realm.zone.a # Disabled, needs 15.2.4 as an upgrade start
- node-exporter.a
- alertmanager.a
- - mon.b
@ -34,4 +33,4 @@ roles:
- prometheus.a
- grafana.a
- node-exporter.b
# - ceph.iscsi.iscsi.a # needs later start point
- ceph.iscsi.iscsi.a

4
qa/suites/orch/cephadm/upgrade/4-wait.yaml
View File

@ -2,13 +2,15 @@ tasks:
- cephadm.shell:
env: [sha1]
mon.a:
- while ceph orch upgrade status | jq '.in_progress' | grep true && ! ceph orch upgrade status | jq '.message' | grep Error ; do ceph orch ps ; ceph versions ; ceph orch upgrade status ; sleep 30 ; done
- while ceph orch upgrade status | jq '.in_progress' | grep true && ! ceph orch upgrade status | jq '.message' | grep Error ; do ceph orch ps ; ceph versions ; ceph orch upgrade status ; ceph health detail ; sleep 30 ; done
- ceph orch ps
- ceph versions
- echo "wait for servicemap items w/ changing names to refresh"
- sleep 60
- ceph orch ps
- ceph versions
- ceph orch upgrade status
- ceph health detail
- ceph versions | jq -e '.overall | length == 1'
- ceph versions | jq -e '.overall | keys' | grep $sha1
- ceph orch ls | grep '^osd '