]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-volume: ignore failure to load ceph configuration for block.db size
authorAndrew Schoen <aschoen@redhat.com>
Thu, 4 Oct 2018 17:47:48 +0000 (12:47 -0500)
committerAndrew Schoen <aschoen@redhat.com>
Mon, 15 Oct 2018 16:55:52 +0000 (11:55 -0500)
If we fail to load a ceph configureation file when trying to get the
block.db size then just use defaults instead of throwing an error.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit a7ee36ca92b6592b6b3e218252c6a4c30416591b)

src/ceph-volume/ceph_volume/util/prepare.py

index aaeced84222eb92408494dd3b0054cec7b17a913..9c8229e83e5b48d194837c3814ebcdcf66ba957a 100644 (file)
@@ -83,7 +83,12 @@ def get_block_db_size(lv_format=True):
     .. note: Configuration values are in bytes, unlike journals which
              are defined in gigabytes
     """
-    conf_db_size = conf.ceph.get_safe('osd', 'bluestore_block_db_size', None)
+    conf_db_size = None
+    try:
+        conf_db_size = conf.ceph.get_safe('osd', 'bluestore_block_db_size', None)
+    except RuntimeError:
+        logger.debug("failed to load ceph configuration, will use defaults")
+
     if not conf_db_size:
         logger.debug(
             'block.db has no size configuration, will fallback to using as much as possible'