ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

osd_memory_target: standardize unit and fix calculation 

* The default value of osd_memory_target used by ceph is 4294967296 bytes,
so use the same as ceph-ansible default.

* Convert ansible_memtotal_mb to bytes to calculate osd_memory_target

Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 10538e9a23)
pull/3351/head
Neha Ojha 2018-11-19 06:50:02 +00:00 committed by mergify[bot]
parent f5d8701ed8
commit c96af4bac9
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
group_vars/all.yml.sample
View File

@ -362,7 +362,7 @@ dummy:
#is_hci: false #is_hci: false
#hci_safety_factor: 0.2 #hci_safety_factor: 0.2
#non_hci_safety_factor: 0.7 #non_hci_safety_factor: 0.7
#osd_memory_target: 4000000000 #osd_memory_target: 4294967296
#journal_size: 5120 # OSD journal size in MB #journal_size: 5120 # OSD journal size in MB
#block_db_size: -1 # block db size in bytes for the ceph-volume lvm batch. -1 means use the default of 'as big as possible'. #block_db_size: -1 # block db size in bytes for the ceph-volume lvm batch. -1 means use the default of 'as big as possible'.
#public_network: 0.0.0.0/0 #public_network: 0.0.0.0/0

2
group_vars/rhcs.yml.sample
View File

@ -362,7 +362,7 @@ ceph_rhcs_version: 3
#is_hci: false #is_hci: false
#hci_safety_factor: 0.2 #hci_safety_factor: 0.2
#non_hci_safety_factor: 0.7 #non_hci_safety_factor: 0.7
#osd_memory_target: 4000000000 #osd_memory_target: 4294967296
#journal_size: 5120 # OSD journal size in MB #journal_size: 5120 # OSD journal size in MB
#block_db_size: -1 # block db size in bytes for the ceph-volume lvm batch. -1 means use the default of 'as big as possible'. #block_db_size: -1 # block db size in bytes for the ceph-volume lvm batch. -1 means use the default of 'as big as possible'.
#public_network: 0.0.0.0/0 #public_network: 0.0.0.0/0

8
roles/ceph-config/templates/ceph.conf.j2
View File

@ -155,12 +155,12 @@ filestore xattr use omap = true
{% set _num_osds = num_osds | default(0) | int %} {% set _num_osds = num_osds | default(0) | int %}
[osd] [osd]
{% if is_hci and _num_osds > 0 %} {% if is_hci and _num_osds > 0 %}
{% if ansible_memtotal_mb * hci_safety_factor / _num_osds > osd_memory_target %} # hci_safety_factor is the safety factor for HCI deployments {% if ansible_memtotal_mb * 1048576 * hci_safety_factor / _num_osds > osd_memory_target %} # hci_safety_factor is the safety factor for HCI deployments
{% set _osd_memory_target = (ansible_memtotal_mb * hci_safety_factor / _num_osds) %} {% set _osd_memory_target = (ansible_memtotal_mb * 1048576 * hci_safety_factor / _num_osds) %}
{% endif %} {% endif %}
{% elif _num_osds > 0 %} {% elif _num_osds > 0 %}
{% if ansible_memtotal_mb * non_hci_safety_factor / _num_osds > osd_memory_target %} # non_hci_safety_factor is the safety factor for dedicated nodes {% if ansible_memtotal_mb * 1048576 * non_hci_safety_factor / _num_osds > osd_memory_target %} # non_hci_safety_factor is the safety factor for dedicated nodes
{% set _osd_memory_target = (ansible_memtotal_mb * non_hci_safety_factor / _num_osds) %} {% set _osd_memory_target = (ansible_memtotal_mb * 1048576 * non_hci_safety_factor / _num_osds) %}
{% endif %} {% endif %}
{% endif %} {% endif %}
osd memory target = {{ _osd_memory_target | default(osd_memory_target) }} osd memory target = {{ _osd_memory_target | default(osd_memory_target) }}

2
roles/ceph-defaults/defaults/main.yml
View File

@ -354,7 +354,7 @@ cephfs_pools:
is_hci: false is_hci: false
hci_safety_factor: 0.2 hci_safety_factor: 0.2
non_hci_safety_factor: 0.7 non_hci_safety_factor: 0.7
osd_memory_target: 4000000000 osd_memory_target: 4294967296
journal_size: 5120 # OSD journal size in MB journal_size: 5120 # OSD journal size in MB
block_db_size: -1 # block db size in bytes for the ceph-volume lvm batch. -1 means use the default of 'as big as possible'. block_db_size: -1 # block db size in bytes for the ceph-volume lvm batch. -1 means use the default of 'as big as possible'.
public_network: 0.0.0.0/0 public_network: 0.0.0.0/0