From 2d0a9a8dc3f0464da1070bc7d90642acb0b34351 Mon Sep 17 00:00:00 2001 From: Igor Fedotov Date: Mon, 8 Apr 2019 21:24:31 +0300 Subject: [PATCH] os/ceph-bluestore-tool: bluefs-bdev-expand asserts if no WAL Fixes: https://tracker.ceph.com/issues/39143 Signed-off-by: Igor Fedotov --- src/os/bluestore/BlueStore.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index e94d9381346..4ca8275435d 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -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 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 -- 2.39.5