openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "[ceph-client] Don't wait for premerge PGs in the rbd pool job"

Browse Source
This commit is contained in:
Zuul 2021-02-05 22:11:04 +00:00 committed by Gerrit Code Review
commit 485605e74a
2 changed files with 2 additions and 2 deletions
ceph-client
Chart.yaml
templates/bin/pool
_init.sh.tpl

2
ceph-client/Chart.yaml

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

2
ceph-client/templates/bin/pool/_init.sh.tpl

@ -33,7 +33,7 @@ function wait_for_pgs () {
echo "#### Start: Checking pgs ####"
pgs_ready=0
query='map({state: .state}) | group_by(.state) | map({state: .[0].state, count: length}) | .[] | select(.state | contains("active") | not)'
query='map({state: .state}) | group_by(.state) | map({state: .[0].state, count: length}) | .[] | select(.state | contains("active") or contains("premerge") | not)'
if [[ $(ceph mon versions | awk '/version/{print $3}' | cut -d. -f1) -ge 14 ]]; then
query=".pg_stats | ${query}"