Skip to content

Persist the committed fill above logical before settling a head to it… #930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
evoskuil merged 2 commits into from
Sep 15, 2026
Merged

Persist the committed fill above logical before settling a head to it… #930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff33f68
Persist the committed fill above logical before settling a head to it…
evoskuil Sep 15, 2026
a2282d3
Raise logical over the fill before reading it in the settle test.
evoskuil Sep 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions include/bitcoin/database/impl/memory/mmap_staging.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1417,11 +1417,19 @@ bool CLASS::share_(size_t transferred) NOEXCEPT
auto shared = false;
if (loaded_.load() && !fault_.load() && (marks_.load() == transferred))
{
// The drain transfers below logical; the committed fill above it is
// content (a raised logical exposes it unwritten).
const auto logical = to_width<zero>(logical_.load());
const auto span = to_width<zero>(capacity_.load());
shared = mmap_share(memory_map_[zero], span, opened_[zero],
zero) != fail;
const auto persisted = (span <= logical) || pwrite_all(opened_[zero],
std::next(memory_map_[zero], logical), span - logical, logical);

if (!shared)
shared = persisted && (mmap_share(memory_map_[zero], span,
opened_[zero], zero) != fail);

if (!persisted)
set_first_code(error::fsync_failure);
else if (!shared)
set_first_code(error::mmap_failure);
#if !defined(WITHOUT_MADVISE)
else if (!advise_(memory_map_[zero], span))
Expand Down
26 changes: 26 additions & 0 deletions test/memory/mmap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1532,6 +1532,32 @@ BOOST_AUTO_TEST_CASE(mmap__settle__sustained_writes__unsettled_without_loss)
BOOST_REQUIRE(!instance.get_fault());
}

BOOST_AUTO_TEST_CASE(mmap__settle__filled_tail_above_logical__survives_settle)
{
constexpr size_t cells = 512;
constexpr size_t tail = add1(cells);
constexpr auto fill = system::bit_all<uint64_t>;

const std::string file = TEST_PATH;
BOOST_REQUIRE(test::create(file));

map instance(file, { 1, 50 });
BOOST_REQUIRE(!instance.open());
BOOST_REQUIRE(!instance.load());
BOOST_REQUIRE_NE(instance.allocate(cell_width), storage::eof);
BOOST_REQUIRE(instance.get_filled(cells * cell_width, cell_width, system::bit_all<uint8_t>));
BOOST_REQUIRE_GT(instance.capacity(), add1(tail) * cell_width);

instance.current(true);
BOOST_REQUIRE(settled_within(instance, true, settle_wait));
BOOST_REQUIRE(instance.get_filled(tail * cell_width, cell_width, system::bit_all<uint8_t>));
BOOST_REQUIRE_EQUAL(read_cells(instance, add1(tail)).back(), fill);

BOOST_REQUIRE(!instance.unload());
BOOST_REQUIRE(!instance.close());
BOOST_REQUIRE(!instance.get_fault());
}

#endif // MANAGE_STAGING

BC_POP_WARNING()
Expand Down
Loading