openstack/openstack-helm-infra
Code Issues Proposed changes

[ceph-osd] Skip pod wait in post-apply job when disruptive

Browse Source 
The new, disruptive post-apply logic to restart ceph-osd pods more
efficiently on upgrade still waits for pods to be in a non-
disruptive state before restarting them disruptively. This change
skips that wait if a disruptive restart is in progress.

Change-Id: I484a3b899c61066aab6be43c4077fff2db6f54bc
This commit is contained in:
Stephen Taylor 2022-04-02 08:54:26 -06:00
parent 7b93d86fa6
commit 3b0d3cac44
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceph-osd/Chart.yaml
View File

@ -15,6 +15,6 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Ceph OSD description: OpenStack-Helm Ceph OSD
name: ceph-osd name: ceph-osd
version: 0.1.37 version: 0.1.38
home: https://github.com/ceph/ceph home: https://github.com/ceph/ceph
... ...

4
ceph-osd/templates/bin/_post-apply.sh.tpl
View File

@ -166,7 +166,9 @@ function restart_by_rack() {
done done
} }
wait_for_pods $CEPH_NAMESPACE if [[ "$DISRUPTIVE_OSD_RESTART" != "true" ]]; then
wait_for_pods $CEPH_NAMESPACE
fi
require_upgrade=0 require_upgrade=0
max_release=0 max_release=0

1
releasenotes/notes/ceph-osd.yaml
View File

@ -38,4 +38,5 @@ ceph-osd:
- 0.1.35 Consolidate mon_endpoints discovery - 0.1.35 Consolidate mon_endpoints discovery
- 0.1.36 Add OSD device location pre-check - 0.1.36 Add OSD device location pre-check
- 0.1.37 Add a disruptive OSD restart to the post-apply job - 0.1.37 Add a disruptive OSD restart to the post-apply job
- 0.1.38 Skip pod wait in post-apply job when disruptive
... ...