]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
os/ceph-bluestore-tool: bluefs-bdev-expand asserts if no WAL 27523/head
authorIgor Fedotov <ifedotov@suse.com>
Mon, 8 Apr 2019 18:24:31 +0000 (21:24 +0300)
committerNathan Cutler <ncutler@suse.com>
Thu, 11 Apr 2019 16:04:43 +0000 (18:04 +0200)
Fixes: https://tracker.ceph.com/issues/39143
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 2d0a9a8dc3f0464da1070bc7d90642acb0b34351)

src/os/bluestore/BlueStore.cc

index 8358ecbaa9dabb0910134be1c3868bf7bf8e4efe..552625a437841e8c732b26f4c6e84c6a35fba091 100644 (file)
@@ -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