From: Loic Dachary <ldachary@redhat.com>
Date: Thu, 8 Jun 2017 13:52:52 +0000 (+0200)
Subject: ceph-disk: sensible default for block.db
X-Git-Tag: v12.1.0~189^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2a5cd5dc1e17eef0dbf9807200b42dc9f99e0e66;p=ceph-ci.git

ceph-disk: sensible default for block.db

If bluestore_block_db_size is unset or zero, fallback to a sensible
default which is block_size / 100. With a minimum of 1GB.

Signed-off-by: Loic Dachary <loic@dachary.org>
---

diff --git a/src/ceph-disk/ceph_disk/main.py b/src/ceph-disk/ceph_disk/main.py
index 9f24655135b..de036cd0320 100755
--- a/src/ceph-disk/ceph_disk/main.py
+++ b/src/ceph-disk/ceph_disk/main.py
@@ -2407,15 +2407,22 @@ class PrepareBluestoreBlockDB(PrepareSpace):
         super(PrepareBluestoreBlockDB, self).__init__(args)
 
     def get_space_size(self):
-        block_size = get_conf(
+        block_db_size = get_conf(
             cluster=self.args.cluster,
             variable='bluestore_block_db_size',
         )
 
-        if block_size is None:
-            return 20480  # MB, default value
+        if block_db_size is None or int(block_db_size) == 0:
+            block_size = get_conf(
+                cluster=self.args.cluster,
+                variable='bluestore_block_size',
+            )
+            if block_size is None:
+                return 1024  # MB
+            size = int(block_size) / 100 / 1048576
+            return max(size, 1024)  # MB
         else:
-            return int(block_size) / 1048576  # MB
+            return int(block_db_size) / 1048576  # MB
 
     def desired_partition_number(self):
         if getattr(self.args, 'block.db') == self.args.data: