From: Andrew Schoen Date: Fri, 30 Nov 2018 17:55:27 +0000 (-0600) Subject: ceph-volume: set use_large_block_db in validate, not compute X-Git-Tag: v13.2.7~217^2~23 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=295741967346d4bf848324a5e7c21c8bc86d2cc3;p=ceph.git ceph-volume: set use_large_block_db in validate, not compute The self.use_large_block_db property was never getting set because the block in compute was never called as block_db_size was reset in validate if it was 0. We needed to set self.use_large_block_db in validate instead of compute. Signed-off-by: Andrew Schoen (cherry picked from commit fdfb79b91c52f82877d08190cb626ed00b45f3e8) --- diff --git a/src/ceph-volume/ceph_volume/devices/lvm/strategies/bluestore.py b/src/ceph-volume/ceph_volume/devices/lvm/strategies/bluestore.py index 39465f71e1b4..e9a0e268c9b8 100644 --- a/src/ceph-volume/ceph_volume/devices/lvm/strategies/bluestore.py +++ b/src/ceph-volume/ceph_volume/devices/lvm/strategies/bluestore.py @@ -183,12 +183,6 @@ class MixedType(MixedStrategy): def compute(self): osds = self.computed['osds'] - # unconfigured block db size will be 0, so set it back to using as much - # as possible from looking at extents - if self.block_db_size.b == 0: - self.block_db_size = disk.Size(b=self.vg_extents['sizes']) - self.use_large_block_db = True - if not self.common_vg: # there isn't a common vg, so a new one must be created with all # the blank SSDs @@ -352,6 +346,7 @@ class MixedType(MixedStrategy): # into the number of block.db LVs needed (i.e. "as large as possible") if self.block_db_size.b == 0: self.block_db_size = self.total_available_db_space / self.dbs_needed + self.use_large_block_db = True total_dbs_possible = self.total_available_db_space / self.block_db_size