]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
os/ceph-bluestore-tool: bluefs-bdev-expand asserts if no WAL
authorIgor Fedotov <ifedotov@suse.com>
Mon, 8 Apr 2019 18:24:31 +0000 (21:24 +0300)
committerIgor Fedotov <ifedotov@suse.com>
Mon, 8 Apr 2019 18:24:31 +0000 (21:24 +0300)
Fixes: https://tracker.ceph.com/issues/39143
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
src/os/bluestore/BlueStore.cc

index e94d9381346e3e193c7c750d84497c2eea0003ef..4ca8275435d36ce6e0e0c934ba46ce6168c0a6b8 100644 (file)
@@ -6439,11 +6439,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