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 <aschoen@redhat.com>
(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 39465f71e1b40705ca3fac28ee0c8fbc0c45e5a5..e9a0e268c9b89929cb51230dbaffab7054c34326 100644 (file)
--- 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