From: Guillaume Abrioux Date: Thu, 4 Feb 2021 15:24:03 +0000 (+0100) Subject: rolling_update: pg check refactor X-Git-Tag: v6.0.0~14 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=44fbadb50cbec4d3944fd91753a6520e6c608ad2;p=ceph-ansible.git rolling_update: pg check refactor There's no need to achieve this in two tasks. Signed-off-by: Guillaume Abrioux --- diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml index 0213fb1b5..45136c7e3 100644 --- a/infrastructure-playbooks/rolling_update.yml +++ b/infrastructure-playbooks/rolling_update.yml @@ -422,23 +422,17 @@ CEPH_VOLUME_DEBUG: "{{ ceph_volume_debug }}" when: not containerized_deployment | bool - - name: get num_pgs - non container - command: "{{ container_exec_cmd_update_osd|default('') }} ceph --cluster {{ cluster }} pg stat --format json" - changed_when: false - register: ceph_pgs - delegate_to: "{{ groups[mon_group_name][0] }}" - - name: waiting for clean pgs... command: "{{ container_exec_cmd_update_osd|default('') }} ceph --cluster {{ cluster }} pg stat --format json" register: ceph_health_post until: > (((ceph_health_post.stdout | from_json).pg_summary.num_pg_by_state | length) > 0) and - (((ceph_health_post.stdout | from_json).pg_summary.num_pg_by_state | selectattr('name', 'search', '^active\\+clean') | map(attribute='num') | list | sum) == (ceph_pgs.stdout | from_json).pg_summary.num_pgs) + (((ceph_health_post.stdout | from_json).pg_summary.num_pg_by_state | selectattr('name', 'search', '^active\\+clean') | map(attribute='num') | list | sum) == (ceph_health_post.stdout | from_json).pg_summary.num_pgs) delegate_to: "{{ groups[mon_group_name][0] }}" + changed_when: false retries: "{{ health_osd_check_retries }}" delay: "{{ health_osd_check_delay }}" - when: (ceph_pgs.stdout | from_json).pg_summary.num_pgs != 0 - name: complete osd upgrade