]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
ceph-volume: set use_large_block_db in validate, not compute
authorAndrew Schoen <aschoen@redhat.com>
Fri, 30 Nov 2018 17:55:27 +0000 (11:55 -0600)
committerAndrew Schoen <aschoen@redhat.com>
Thu, 6 Dec 2018 18:29:47 +0000 (12:29 -0600)
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 <aschoen@redhat.com>
src/ceph-volume/ceph_volume/devices/lvm/strategies/bluestore.py

index 8cb6618b9e53f51ca282fb991ca53983ebfd568a..abb54c543be5b5a4f851e7004b5faae0356b06cf 100644 (file)
@@ -216,12 +216,6 @@ class MixedType(object):
     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
@@ -396,6 +390,7 @@ class MixedType(object):
         # 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