From: Alfredo Deza Date: Thu, 9 Aug 2018 19:02:01 +0000 (-0400) Subject: ceph-volume lvm.strategies use get_journal_size helper for filestore X-Git-Tag: v14.0.1~520^2~3^2~15 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=01aebfc6a075bc91d0dc345f9cd953e3a4259015;p=ceph.git ceph-volume lvm.strategies use get_journal_size helper for filestore Signed-off-by: Alfredo Deza --- diff --git a/src/ceph-volume/ceph_volume/devices/lvm/strategies/filestore.py b/src/ceph-volume/ceph_volume/devices/lvm/strategies/filestore.py index 6651b4e94ec2..56372c6efb6d 100644 --- a/src/ceph-volume/ceph_volume/devices/lvm/strategies/filestore.py +++ b/src/ceph-volume/ceph_volume/devices/lvm/strategies/filestore.py @@ -1,6 +1,6 @@ from __future__ import print_function import json -from ceph_volume.util import disk +from ceph_volume.util import disk, prepare from ceph_volume.api import lvm from . import validators from ceph_volume.devices.lvm.create import Create @@ -67,9 +67,8 @@ class SingleType(object): osds = self.computed['osds'] vgs = self.computed['vgs'] for device in devices: - # XXX needs to read `osd journal size` from ceph.conf device_size = disk.Size(b=device['size']) - journal_size = disk.Size(gb=5) + journal_size = prepare.get_journal_size(lv_format=False) data_size = device_size - journal_size data_percentage = data_size * 100 / device_size vgs.append({'devices': [device['path']], 'parts': 2}) @@ -99,8 +98,9 @@ class SingleType(object): # create the lvs from the vgs captured in the beginning for vg in osd_vgs: - # XXX needs to read `osd journal size` from ceph.conf - journal_lv = lvm.create_lv('osd-journal', vg.name, size='5G') + # this is called again, getting us the LVM formatted string + journal_size = prepare.get_journal_size() + journal_lv = lvm.create_lv('osd-journal', vg.name, size=journal_size) # no extents or size means it will use 100%FREE data_lv = lvm.create_lv('osd-data', vg.name)