-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add patches to fix calculation of
num_osd
Original commit message: Subject: [PATCH] ceph-config: fix calculation of `num_osds` The number of OSDs defined by the `lvm_volumes` variable is added to `num_osds` in task `Count number of osds for lvm scenario`. Therefore theses devices must not be counted in task `Set_fact num_osds (add existing osds)`. There are currently three problems with the existing approach: 1. Bluestore DB and WAL devices are counted as OSDs 2. `lvm_volumes` supports a second notation to directly specify logical volumes instead of devices when the `data_vg` key exists. This scenario is not yet accounted for. 3. The `difference` filter used to remove devices from `lvm_volumes` returns a list of **unique** elements, thus not accounting for multiple OSDs on a single device The first problem is solved by filtering the list of logical volumes for devices used as `type` `block`. For the second and third problem lists are created from `lvm_volumes` containing either paths to devices or logical volumes devices. For the second problem the output of `ceph-volume` is simply filtered for `lv_path`s appearing in the list of logical volume devices described above. To solve the third problem the remaining OSDs in the output are compiled into a list of their used devices, which is then filtered for devices appearing in the list of devices from `lvm_volumes`. Fixes: ceph/ceph-ansible#7435 Signed-off-by: Jan Horstmann <[email protected]>
- Loading branch information
1 parent
6dfb3c3
commit 1569e58
Showing
2 changed files
with
134 additions
and
0 deletions.
There are no files selected for viewing
68 changes: 68 additions & 0 deletions
68
patches/stable-7.0/ceph-config-fix-calculation-of-num_osds.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| From 7d4188a08df749c211813b8bda355d03d09dad45 Mon Sep 17 00:00:00 2001 | ||
| From: Jan Horstmann <[email protected]> | ||
| Date: Thu, 14 Mar 2024 17:52:29 +0100 | ||
| Subject: [PATCH] ceph-config: fix calculation of `num_osds` | ||
|
|
||
| The number of OSDs defined by the `lvm_volumes` variable is added to | ||
| `num_osds` in task `Count number of osds for lvm scenario`. Therefore | ||
| theses devices must not be counted in task | ||
| `Set_fact num_osds (add existing osds)`. | ||
| There are currently three problems with the existing approach: | ||
| 1. Bluestore DB and WAL devices are counted as OSDs | ||
| 2. `lvm_volumes` supports a second notation to directly specify logical | ||
| volumes instead of devices when the `data_vg` key exists. | ||
| This scenario is not yet accounted for. | ||
| 3. The `difference` filter used to remove devices from `lvm_volumes` | ||
| returns a list of **unique** elements, thus not accounting for | ||
| multiple OSDs on a single device | ||
|
|
||
| The first problem is solved by filtering the list of logical volumes for | ||
| devices used as `type` `block`. | ||
| For the second and third problem lists are created from `lvm_volumes` | ||
| containing either paths to devices or logical volumes devices. | ||
| For the second problem the output of `ceph-volume` is simply filtered | ||
| for `lv_path`s appearing in the list of logical volume devices described | ||
| above. | ||
| To solve the third problem the remaining OSDs in the output are | ||
| compiled into a list of their used devices, which is then filtered for | ||
| devices appearing in the list of devices from `lvm_volumes`. | ||
|
|
||
| Fixes: https://github.com/ceph/ceph-ansible/issues/7435 | ||
|
|
||
| Signed-off-by: Jan Horstmann <[email protected]> | ||
| --- | ||
| roles/ceph-config/tasks/main.yml | 17 +++++++++++++++-- | ||
| 1 file changed, 15 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/roles/ceph-config/tasks/main.yml b/roles/ceph-config/tasks/main.yml | ||
| index 8e62369f7..6b05e196c 100644 | ||
| --- a/roles/ceph-config/tasks/main.yml | ||
| +++ b/roles/ceph-config/tasks/main.yml | ||
| @@ -90,9 +90,22 @@ | ||
| PYTHONIOENCODING: utf-8 | ||
| changed_when: false | ||
|
|
||
| - - name: set_fact num_osds (add existing osds) | ||
| + - name: Set_fact num_osds (add existing osds) | ||
| + vars: | ||
| + lvm_volumes_devices: "{{ lvm_volumes | default([]) | rejectattr('data_vg', 'defined') | map(attribute='data') | list }}" | ||
| + lvm_volumes_lv_paths: "{{ | ||
| + ['/dev'] | ||
| + | product( | ||
| + lvm_volumes | default([]) | selectattr('data_vg', 'defined') | map(attribute='data_vg') | ||
| + | zip( | ||
| + lvm_volumes | default([]) | selectattr('data_vg', 'defined') | map(attribute='data') | ||
| + ) | ||
| + | map('join', '/') | ||
| + ) | ||
| + | map('join', '/') | ||
| + }}" | ||
| set_fact: | ||
| - num_osds: "{{ num_osds | int + (lvm_list.stdout | default('{}') | from_json | dict2items | map(attribute='value') | flatten | map(attribute='devices') | sum(start=[]) | difference(lvm_volumes | default([]) | map(attribute='data')) | length | int) }}" | ||
| + num_osds: "{{ num_osds | int + (lvm_list.stdout | default('{}') | from_json | dict2items | map(attribute='value') | flatten | selectattr('type', 'equalto', 'block') | rejectattr('lv_path', 'in', lvm_volumes_lv_paths) | map(attribute='devices') | flatten | reject('in', lvm_volumes_devices) | length | int) }}" | ||
|
|
||
| - name: set osd related config facts | ||
| when: inventory_hostname in groups.get(osd_group_name, []) | ||
| -- | ||
| 2.45.1 | ||
|
|
66 changes: 66 additions & 0 deletions
66
patches/stable-8.0/ceph-config-fix-calculation-of-num_osds.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| From 0995ce74d6edf68db5d271be153ce93f23ab8f8d Mon Sep 17 00:00:00 2001 | ||
| From: Jan Horstmann <[email protected]> | ||
| Date: Thu, 14 Mar 2024 17:52:29 +0100 | ||
| Subject: [PATCH] ceph-config: fix calculation of `num_osds` | ||
|
|
||
| The number of OSDs defined by the `lvm_volumes` variable is added to | ||
| `num_osds` in task `Count number of osds for lvm scenario`. Therefore | ||
| theses devices must not be counted in task | ||
| `Set_fact num_osds (add existing osds)`. | ||
| There are currently three problems with the existing approach: | ||
| 1. Bluestore DB and WAL devices are counted as OSDs | ||
| 2. `lvm_volumes` supports a second notation to directly specify logical | ||
| volumes instead of devices when the `data_vg` key exists. | ||
| This scenario is not yet accounted for. | ||
| 3. The `difference` filter used to remove devices from `lvm_volumes` | ||
| returns a list of **unique** elements, thus not accounting for | ||
| multiple OSDs on a single device | ||
|
|
||
| The first problem is solved by filtering the list of logical volumes for | ||
| devices used as `type` `block`. | ||
| For the second and third problem lists are created from `lvm_volumes` | ||
| containing either paths to devices or logical volumes devices. | ||
| For the second problem the output of `ceph-volume` is simply filtered | ||
| for `lv_path`s appearing in the list of logical volume devices described | ||
| above. | ||
| To solve the third problem the remaining OSDs in the output are | ||
| compiled into a list of their used devices, which is then filtered for | ||
| devices appearing in the list of devices from `lvm_volumes`. | ||
|
|
||
| Fixes: https://github.com/ceph/ceph-ansible/issues/7435 | ||
|
|
||
| Signed-off-by: Jan Horstmann <[email protected]> | ||
| --- | ||
| roles/ceph-config/tasks/main.yml | 15 ++++++++++++++- | ||
| 1 file changed, 14 insertions(+), 1 deletion(-) | ||
|
|
||
| diff --git a/roles/ceph-config/tasks/main.yml b/roles/ceph-config/tasks/main.yml | ||
| index 3dad8af7a..c25fd20e2 100644 | ||
| --- a/roles/ceph-config/tasks/main.yml | ||
| +++ b/roles/ceph-config/tasks/main.yml | ||
| @@ -91,8 +91,21 @@ | ||
| changed_when: false | ||
|
|
||
| - name: Set_fact num_osds (add existing osds) | ||
| + vars: | ||
| + lvm_volumes_devices: "{{ lvm_volumes | default([]) | rejectattr('data_vg', 'defined') | map(attribute='data') | list }}" | ||
| + lvm_volumes_lv_paths: "{{ | ||
| + ['/dev'] | ||
| + | product( | ||
| + lvm_volumes | default([]) | selectattr('data_vg', 'defined') | map(attribute='data_vg') | ||
| + | zip( | ||
| + lvm_volumes | default([]) | selectattr('data_vg', 'defined') | map(attribute='data') | ||
| + ) | ||
| + | map('join', '/') | ||
| + ) | ||
| + | map('join', '/') | ||
| + }}" | ||
| ansible.builtin.set_fact: | ||
| - num_osds: "{{ num_osds | int + (lvm_list.stdout | default('{}') | from_json | dict2items | map(attribute='value') | flatten | map(attribute='devices') | sum(start=[]) | difference(lvm_volumes | default([]) | map(attribute='data')) | length | int) }}" | ||
| + num_osds: "{{ num_osds | int + (lvm_list.stdout | default('{}') | from_json | dict2items | map(attribute='value') | flatten | selectattr('type', 'equalto', 'block') | rejectattr('lv_path', 'in', lvm_volumes_lv_paths) | map(attribute='devices') | flatten | reject('in', lvm_volumes_devices) | length | int) }}" | ||
|
|
||
| - name: Set osd related config facts | ||
| when: inventory_hostname in groups.get(osd_group_name, []) | ||
| -- | ||
| 2.45.1 | ||
|
|