openstack/openstack-helm-infra
Code Issues Proposed changes

[Ceph-client, ceph-osd] Update helm test

Browse Source 
The PS updates helm test and replaces "expected_osds" variable
by the amount of OSDs available in the cluster (ceph-client).
Also the PS updates the logic of calculation of minimum amount of OSDs.

Change-Id: Ic8402d668d672f454f062bed369cac516ed1573e
This commit is contained in:
Kabanov, Dmitrii 2020-07-06 18:13:28 -07:00 committed by Dmitrii Kabanov
parent 0d5aeaacbb
commit eecf56b8a9
3 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ceph-client/templates/bin/_helm-tests.sh.tpl
View File

@ -33,19 +33,19 @@ function check_osd_count() {
num_osd=$(ceph osd stat | tr ' ' '\n' | grep -x -E '[0-9]+' | head -n1) num_osd=$(ceph osd stat | tr ' ' '\n' | grep -x -E '[0-9]+' | head -n1)
num_in_osds=$(ceph osd stat | tr ' ' '\n' | grep -x -E '[0-9]+' | tail -n1) num_in_osds=$(ceph osd stat | tr ' ' '\n' | grep -x -E '[0-9]+' | tail -n1)
num_up_osds=$(ceph osd stat | tr ' ' '\n' | grep -x -E '[0-9]+' | head -n2 | tail -n1) num_up_osds=$(ceph osd stat | tr ' ' '\n' | grep -x -E '[0-9]+' | head -n2 | tail -n1)
if [ $EXPECTED_OSDS == 1 ]; then
MIN_EXPECTED_OSDS=$EXPECTED_OSDS MIN_OSDS=$((${num_osd}*$REQUIRED_PERCENT_OF_OSDS/100))
else if [ ${MIN_OSDS} -lt 1 ]; then
MIN_EXPECTED_OSDS=$(($EXPECTED_OSDS*$REQUIRED_PERCENT_OF_OSDS/100)) MIN_OSDS=1
fi fi
if [ "${num_osd}" -eq 0 ]; then if [ "${num_osd}" -eq 0 ]; then
echo "There are no osds in the cluster" echo "There are no osds in the cluster"
exit 1 exit 1
elif [ "${num_in_osds}" -ge "${MIN_EXPECTED_OSDS}" ] && [ "${num_up_osds}" -ge "${MIN_EXPECTED_OSDS}" ]; then elif [ "${num_in_osds}" -ge "${MIN_OSDS}" ] && [ "${num_up_osds}" -ge "${MIN_OSDS}" ]; then
echo "Required number of OSDs (${MIN_EXPECTED_OSDS}) are UP and IN status" echo "Required number of OSDs (${MIN_OSDS}) are UP and IN status"
else else
echo "Required number of OSDs (${MIN_EXPECTED_OSDS}) are NOT UP and IN status. Cluster shows OSD count=${num_osd}, UP=${num_up_osds}, IN=${num_in_osds}" echo "Required number of OSDs (${MIN_OSDS}) are NOT UP and IN status. Cluster shows OSD count=${num_osd}, UP=${num_up_osds}, IN=${num_in_osds}"
exit 1 exit 1
fi fi
} }

2
ceph-client/templates/pod-helm-tests.yaml
View File

@ -42,8 +42,6 @@ spec:
env: env:
- name: CEPH_DEPLOYMENT_NAMESPACE - name: CEPH_DEPLOYMENT_NAMESPACE
value: {{ .Release.Namespace }} value: {{ .Release.Namespace }}
- name: EXPECTED_OSDS
value: {{ .Values.conf.pool.target.osd | quote }}
- name: REQUIRED_PERCENT_OF_OSDS - name: REQUIRED_PERCENT_OF_OSDS
value: {{ .Values.conf.pool.target.required_percent_of_osds | ceil | quote }} value: {{ .Values.conf.pool.target.required_percent_of_osds | ceil | quote }}
- name: EXPECTED_CRUSHRULE - name: EXPECTED_CRUSHRULE

7
ceph-osd/templates/bin/_helm-tests.sh.tpl
View File

@ -22,10 +22,9 @@ function check_osd_count() {
num_in_osds=$(ceph osd stat | tr ' ' '\n' | grep -x -E '[0-9]+' | tail -n1) num_in_osds=$(ceph osd stat | tr ' ' '\n' | grep -x -E '[0-9]+' | tail -n1)
num_up_osds=$(ceph osd stat | tr ' ' '\n' | grep -x -E '[0-9]+' | head -n2 | tail -n1) num_up_osds=$(ceph osd stat | tr ' ' '\n' | grep -x -E '[0-9]+' | head -n2 | tail -n1)
if [ ${num_osd} -eq 1 ]; then MIN_OSDS=$((${num_osd}*$REQUIRED_PERCENT_OF_OSDS/100))
MIN_OSDS=${num_osd} if [ ${MIN_OSDS} -lt 1 ]; then
else MIN_OSDS=1
MIN_OSDS=$((${num_osd}*$REQUIRED_PERCENT_OF_OSDS/100))
fi fi
if [ "${num_osd}" -eq 0 ]; then if [ "${num_osd}" -eq 0 ]; then