From 06471a4b82d63ebb35f80d45aa6ae629a4daeedc Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Wed, 28 Jul 2021 14:54:15 -0400 Subject: [PATCH] osds: use osd pool ls instead of osd dump command The ceph osd pool ls detail command is a subset of the ceph osd dump command. $ ceph osd dump --format json|wc -c 10117 $ ceph osd pool ls detail --format json|wc -c 4740 Signed-off-by: Dimitri Savineau --- infrastructure-playbooks/cephadm-adopt.yml | 4 ++-- infrastructure-playbooks/rolling_update.yml | 4 ++-- ...h-from-non-containerized-to-containerized-ceph-daemons.yml | 4 ++-- roles/ceph-handler/tasks/handler_osds.yml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/infrastructure-playbooks/cephadm-adopt.yml b/infrastructure-playbooks/cephadm-adopt.yml index ddc2993a3..b4ebe655f 100644 --- a/infrastructure-playbooks/cephadm-adopt.yml +++ b/infrastructure-playbooks/cephadm-adopt.yml @@ -444,7 +444,7 @@ name: ceph-defaults - name: get pool list - command: "{{ ceph_cmd }} --cluster {{ cluster }} osd dump -f json" + command: "{{ ceph_cmd }} --cluster {{ cluster }} osd pool ls detail -f json" register: pool_list run_once: true delegate_to: "{{ groups[mon_group_name][0] }}" @@ -463,7 +463,7 @@ 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'] }}" + with_items: "{{ pool_list.stdout | default('{}') | from_json }}" - name: disable balancer command: "{{ ceph_cmd }} --cluster {{ cluster }} balancer off" diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml index 06449eb74..6c248bd20 100644 --- a/infrastructure-playbooks/rolling_update.yml +++ b/infrastructure-playbooks/rolling_update.yml @@ -410,7 +410,7 @@ tasks_from: container_binary.yml - name: get pool list - command: "{{ ceph_cmd }} --cluster {{ cluster }} osd dump -f json" + command: "{{ ceph_cmd }} --cluster {{ cluster }} osd pool ls detail -f json" register: pool_list run_once: true changed_when: false @@ -425,7 +425,7 @@ - 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}]) }}" - with_items: "{{ (pool_list.stdout | default('{}') | from_json)['pools'] }}" + with_items: "{{ pool_list.stdout | default('{}') | from_json }}" - name: disable balancer command: "{{ ceph_cmd }} --cluster {{ cluster }} balancer off" 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 df9b13098..2b4b289e3 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 @@ -216,7 +216,7 @@ tasks_from: container_binary.yml - name: get pool list - command: "{{ ceph_cmd }} --cluster {{ cluster }} osd dump -f json" + command: "{{ ceph_cmd }} --cluster {{ cluster }} osd pool ls detail -f json" register: pool_list changed_when: false check_mode: false @@ -230,7 +230,7 @@ - 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}]) }}" - with_items: "{{ (pool_list.stdout | default('{}') | from_json)['pools'] }}" + with_items: "{{ pool_list.stdout | default('{}') | from_json }}" - name: disable balancer command: "{{ ceph_cmd }} --cluster {{ cluster }} balancer off" diff --git a/roles/ceph-handler/tasks/handler_osds.yml b/roles/ceph-handler/tasks/handler_osds.yml index b34e88f0d..204e09978 100644 --- a/roles/ceph-handler/tasks/handler_osds.yml +++ b/roles/ceph-handler/tasks/handler_osds.yml @@ -39,7 +39,7 @@ mode: 0750 - name: get pool list - command: "{{ ceph_cmd }} --cluster {{ cluster }} osd dump -f json" + command: "{{ ceph_cmd }} --cluster {{ cluster }} osd pool ls detail -f json" register: pool_list delegate_to: "{{ groups.get(mon_group_name, [])[0] }}" run_once: true @@ -58,7 +58,7 @@ 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'] }}" + with_items: "{{ pool_list.stdout | default('{}') | from_json }}" - name: disable balancer command: "{{ ceph_cmd }} --cluster {{ cluster }} balancer off" -- 2.39.5