openstack/openstack-helm-infra
Code Issues Proposed changes

[ceph-client] Fix OSD count checks in the ceph-rbd-pool job

Browse Source 
This change adjusts the minimum OSD count check to be based on the
osd value, and the maxiumum OSD count check to be based on the
final_osd value. This logic supports both full deployments and
partial deployments, with the caveat that it may allow partial
deployments to over-provision storage.

Change-Id: I93aac65df850e686f92347d406cd5bb5a803659d
This commit is contained in:
Stephen Taylor 2022-12-19 14:35:58 -07:00
parent 0aad6d05f0
commit 575c2885de
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceph-client/Chart.yaml
View File

@ -15,6 +15,6 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Ceph Client description: OpenStack-Helm Ceph Client
name: ceph-client name: ceph-client
version: 0.1.39 version: 0.1.40
home: https://github.com/ceph/ceph-client home: https://github.com/ceph/ceph-client
... ...

7
ceph-client/templates/bin/pool/_init.sh.tpl
View File

@ -89,11 +89,12 @@ function check_osd_count() {
num_in_osds=$(awk '/"num_in_osds"/{print $2}' <<< "$osd_stat" | cut -d, -f1) num_in_osds=$(awk '/"num_in_osds"/{print $2}' <<< "$osd_stat" | cut -d, -f1)
num_up_osds=$(awk '/"num_up_osds"/{print $2}' <<< "$osd_stat" | cut -d, -f1) num_up_osds=$(awk '/"num_up_osds"/{print $2}' <<< "$osd_stat" | cut -d, -f1)
EXPECTED_OSDS={{.Values.conf.pool.target.final_osd}} EXPECTED_OSDS={{.Values.conf.pool.target.osd}}
EXPECTED_FINAL_OSDS={{.Values.conf.pool.target.final_osd}}
REQUIRED_PERCENT_OF_OSDS={{.Values.conf.pool.target.required_percent_of_osds}} REQUIRED_PERCENT_OF_OSDS={{.Values.conf.pool.target.required_percent_of_osds}}
if [ ${num_up_osds} -gt ${EXPECTED_OSDS} ]; then if [ ${num_up_osds} -gt ${EXPECTED_FINAL_OSDS} ]; then
echo "More running OSDs (${num_up_osds}) than expected (${EXPECTED_OSDS}). Please correct the expected value (.Values.conf.pool.target.final_osd)." echo "More running OSDs (${num_up_osds}) than expected (${EXPECTED_FINAL_OSDS}). Please correct the expected value (.Values.conf.pool.target.final_osd)."
exit 1 exit 1
fi fi

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

@ -40,4 +40,5 @@ ceph-client:
- 0.1.37 Added OCI registry authentication - 0.1.37 Added OCI registry authentication
- 0.1.38 Make use of noautoscale with Pacific - 0.1.38 Make use of noautoscale with Pacific
- 0.1.39 Correct check for too many OSDs in the pool job - 0.1.39 Correct check for too many OSDs in the pool job
- 0.1.40 Fix OSD count checks in the ceph-rbd-pool job
... ...