From 06158c2ac56f1f7065b96c4db5b8ca404f327390 Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Tue, 20 Jul 2021 11:38:44 -0400 Subject: [PATCH] common: remove unnecessary run_once statements 1303611 introduced tasks for disabling the pg_autoscaler on pools and the balancer but thoses tasks are already executed on the first monitor node so we don't need to add the run_once statement. Signed-off-by: Dimitri Savineau (cherry picked from commit 738fa9428a3c0c9ed0dd1aec566e807ad072daad) --- infrastructure-playbooks/rolling_update.yml | 6 ------ ...rom-non-containerized-to-containerized-ceph-daemons.yml | 7 ------- 2 files changed, 13 deletions(-) diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml index 83f98556c..ef9fcf27f 100644 --- a/infrastructure-playbooks/rolling_update.yml +++ b/infrastructure-playbooks/rolling_update.yml @@ -394,18 +394,15 @@ - name: get balancer module status command: "{{ ceph_cmd }} --cluster {{ cluster }} balancer status -f json" register: balancer_status - run_once: true changed_when: false - name: set_fact pools_pgautoscaler_mode set_fact: pools_pgautoscaler_mode: "{{ pools_pgautoscaler_mode | default([]) | union([{'name': item.pool_name, 'mode': item.pg_autoscale_mode}]) }}" - run_once: true with_items: "{{ (pool_list.stdout | default('{}') | from_json)['pools'] }}" - name: disable balancer command: "{{ ceph_cmd }} --cluster {{ cluster }} balancer off" - run_once: true changed_when: false when: (balancer_status.stdout | from_json)['active'] | bool @@ -415,7 +412,6 @@ cluster: "{{ cluster }}" pg_autoscale_mode: false with_items: "{{ pools_pgautoscaler_mode }}" - run_once: true when: - pools_pgautoscaler_mode is defined - item.mode == 'on' @@ -536,7 +532,6 @@ name: "{{ item.name }}" cluster: "{{ cluster }}" pg_autoscale_mode: true - run_once: true with_items: "{{ pools_pgautoscaler_mode }}" when: - pools_pgautoscaler_mode is defined @@ -559,7 +554,6 @@ - name: re-enable balancer command: "{{ ceph_cmd }} --cluster {{ cluster }} balancer on" - run_once: true changed_when: false when: (balancer_status.stdout | from_json)['active'] | bool diff --git a/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml b/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml index e14f83a31..862e4ffa8 100644 --- a/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml +++ b/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml @@ -218,24 +218,20 @@ - name: get pool list command: "{{ ceph_cmd }} --cluster {{ cluster }} osd dump -f json" register: pool_list - run_once: true changed_when: false - name: get balancer module status command: "{{ ceph_cmd }} --cluster {{ cluster }} balancer status -f json" register: balancer_status - run_once: true changed_when: false - name: set_fact pools_pgautoscaler_mode set_fact: pools_pgautoscaler_mode: "{{ pools_pgautoscaler_mode | default([]) | union([{'name': item.pool_name, 'mode': item.pg_autoscale_mode}]) }}" - run_once: true with_items: "{{ (pool_list.stdout | default('{}') | from_json)['pools'] }}" - name: disable balancer command: "{{ ceph_cmd }} --cluster {{ cluster }} balancer off" - run_once: true changed_when: false when: (balancer_status.stdout | from_json)['active'] | bool @@ -245,7 +241,6 @@ cluster: "{{ cluster }}" pg_autoscale_mode: false with_items: "{{ pools_pgautoscaler_mode }}" - run_once: true when: - pools_pgautoscaler_mode is defined - item.mode == 'on' @@ -410,7 +405,6 @@ cluster: "{{ cluster }}" pg_autoscale_mode: true with_items: "{{ pools_pgautoscaler_mode }}" - run_once: true when: - pools_pgautoscaler_mode is defined - item.mode == 'on' @@ -432,7 +426,6 @@ - name: re-enable balancer command: "{{ ceph_cmd }} --cluster {{ cluster }} balancer on" - run_once: true changed_when: false when: (balancer_status.stdout | from_json)['active'] | bool