From: Igor Fedotov <ifedotov@suse.com>
Date: Mon, 8 Apr 2019 18:24:31 +0000 (+0300)
Subject: os/ceph-bluestore-tool: bluefs-bdev-expand asserts if no WAL
X-Git-Tag: v14.2.1~19^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8d20b4f8f478b75cb814dbd1c14f70b0feb3cf7d;p=ceph.git

os/ceph-bluestore-tool: bluefs-bdev-expand asserts if no WAL

Fixes: https://tracker.ceph.com/issues/39143

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 2d0a9a8dc3f0464da1070bc7d90642acb0b34351)
---

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 8358ecbaa9da..552625a43784 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -6428,11 +6428,16 @@ int BlueStore::expand_devices(ostream& out)
     if (devid == bluefs_shared_bdev ) {
       continue;
     }
+    uint64_t size = bluefs->get_block_device_size(devid);
+    if (size == 0) {
+      // no bdev
+      continue;
+    }
+
     interval_set<uint64_t> before;
     bluefs->get_block_extents(devid, &before);
     ceph_assert(!before.empty());
     uint64_t end = before.range_end();
-    uint64_t size = bluefs->get_block_device_size(devid);
     if (end < size) {
       out << devid
 	  <<" : expanding " << " from 0x" << std::hex