From 8a635203929b126d16a38c9a48d237f3c92a92a8 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Thu, 9 Aug 2018 15:02:01 -0400 Subject: [PATCH] ceph-volume lvm.strategies use get_journal_size helper for filestore Signed-off-by: Alfredo Deza (cherry picked from commit 01aebfc6a075bc91d0dc345f9cd953e3a4259015) --- .../ceph_volume/devices/lvm/strategies/filestore.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 6651b4e94ec21..56372c6efb6d3 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) -- 2.39.5