Skip to content

Fix locking in store rollback #2103

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
achamayou merged 2 commits into from
Jan 22, 2021
Merged

Fix locking in store rollback #2103

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9e924b
.
achamayou Jan 22, 2021
cc183e9
Merge branch 'master' into fix_store_rollback
achamayou Jan 22, 2021
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
39 changes: 19 additions & 20 deletions src/kv/store.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,14 +540,26 @@ namespace kv
term = t.value();
if (v >= version)
return;
}

if (v < commit_version())
{
throw std::logic_error(fmt::format(
"Attempting rollback to {}, earlier than commit version {}",
v,
commit_version()));
if (v < compacted)
{
throw std::logic_error(fmt::format(
"Attempting rollback to {}, earlier than commit version {}",
v,
compacted));
}

version = v;
last_replicated = v;
last_committable = v;
rollback_count++;
pending_txs.clear();
auto h = get_history();
if (h)
h->rollback(v);
auto e = get_encryptor();
if (e)
e->rollback(v);
}

for (auto& it : maps)
Expand Down Expand Up @@ -581,19 +593,6 @@ namespace kv
auto& [_, map] = it.second;
map->unlock();
}

std::lock_guard<SpinLock> vguard(version_lock);
version = v;
last_replicated = v;
last_committable = v;
rollback_count++;
pending_txs.clear();
auto h = get_history();
if (h)
h->rollback(v);
auto e = get_encryptor();
if (e)
e->rollback(v);
}

void set_term(Term t) override
Expand Down