From 41eb537489b790be620b1c29b121f4fb044089f1 Mon Sep 17 00:00:00 2001 From: Adam Kupczyk Date: Sat, 23 Oct 2021 18:28:25 +0000 Subject: [PATCH] os/bluestore/bluefs: Fix volume selection / accounting BlueFS fine grain lock refactor did break accounting in volume selection module. It caused ceph_test_objectstore to fail on SpilloverFixedTest test. Signed-off-by: Adam Kupczyk --- src/os/bluestore/BlueFS.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/os/bluestore/BlueFS.cc b/src/os/bluestore/BlueFS.cc index 610f9921fa264..02c17c94be41c 100644 --- a/src/os/bluestore/BlueFS.cc +++ b/src/os/bluestore/BlueFS.cc @@ -3120,7 +3120,9 @@ int BlueFS::_flush_range_F(FileWriter *h, uint64_t offset, uint64_t length) } dout(20) << __func__ << " file now, unflushed " << h->file->fnode << dendl; - return _flush_data(h, offset, length, buffered); + int res = _flush_data(h, offset, length, buffered); + vselector->add_usage(h->file->vselector_hint, h->file->fnode); + return res; } int BlueFS::_flush_data(FileWriter *h, uint64_t offset, uint64_t length, bool buffered) @@ -3199,7 +3201,6 @@ int BlueFS::_flush_data(FileWriter *h, uint64_t offset, uint64_t length, bool bu } } } - vselector->add_usage(h->file->vselector_hint, h->file->fnode); dout(20) << __func__ << " h " << h << " pos now 0x" << std::hex << h->pos << std::dec << dendl; return 0; @@ -3325,7 +3326,9 @@ int BlueFS::_flush_special(FileWriter *h) uint64_t offset = h->pos; ceph_assert(length + offset <= h->file->fnode.get_allocated()); if (h->file->fnode.size < offset + length) { + vselector->sub_usage(h->file->vselector_hint, h->file->fnode.size); h->file->fnode.size = offset + length; + vselector->add_usage(h->file->vselector_hint, h->file->fnode.size); } return _flush_data(h, offset, length, false); }