Skip to content

Preserve store flags on rollback #7975

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

Draft
Copilot wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Preserve store flags on rollback #7975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f39f76
Initial plan
Copilot Jun 24, 2026
8c384b7
Avoid clearing store flags on rollback
Copilot Jun 24, 2026
7041071
Merge branch 'main' into copilot/microsoft-ccf-7796-update-store-flags
achamayou Jun 25, 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
1 change: 0 additions & 1 deletion src/kv/store.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,6 @@ namespace ccf::kv
// In practice rollback is only called at signature seqnos, so
// clamping here restores the latest committable entry
last_committable = std::min(last_committable, tx_id.seqno);
unset_flag_unsafe(StoreFlag::SNAPSHOT_AT_NEXT_SIGNATURE);
rollback_count++;
pending_txs.clear();
auto e = get_encryptor();
Expand Down
18 changes: 18 additions & 0 deletions src/kv/test/kv_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3512,6 +3512,24 @@ TEST_CASE("Ledger entry chunk request")
store.set_flag(
ccf::kv::AbstractStore::StoreFlag::SNAPSHOT_AT_NEXT_SIGNATURE);

INFO("Roll back a transaction without clearing the snapshot flag");
{
MapTypes::StringString map("public:map");
auto tx = store.create_tx();

auto h1 = tx.rw(map);
h1->put("key", "value");
REQUIRE(tx.commit() == ccf::kv::CommitResult::SUCCESS);

store.rollback(
{store.commit_view(), store.current_version() - 1},
store.commit_view());

REQUIRE(store.flag_enabled(
ccf::kv::AbstractStore::StoreFlag::SNAPSHOT_AT_NEXT_SIGNATURE));
REQUIRE(store.should_create_ledger_chunk(store.current_version()));
}

INFO("Add a signature that triggers a snapshot");
{
auto txid = store.next_txid();
Expand Down