From 8dd46388d2090e975674676c6ff753f7a2d3beb5 Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Fri, 23 Aug 2019 22:52:52 -0400 Subject: [PATCH] os/bluestore: record gifts < expected size in superblock Returning 0 from _balance_bluefs_freespace() skips recording allocations in the superblock, so we fail the consistency check on startup. The elseif branch handles this case already, so just remove it from the first branch. This is luminous/mimic specific, since bluefs extents are not recorded in the superblock in later releases. Signed-off-by: Josh Durgin --- src/os/bluestore/BlueStore.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index 190189fb6bba..4d3b2fa15e2f 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -5377,7 +5377,7 @@ int BlueStore::_balance_bluefs_freespace(PExtentVector *extents) cct->_conf->bluefs_shared_alloc_size, 0, 0, extents); } - if (alloc_len <= 0 || alloc_len < gift) { + if (alloc_len <= 0) { dout(0) << __func__ << " no allocate on 0x" << std::hex << gift << std::dec << dendl; _dump_alloc_on_rebalance_failure(); -- 2.47.3