tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix snapshot recovery max TX logic

Browse Source 
Reviewers: msantl

Reviewed By: msantl

Subscribers: pullbot

Differential Revision: https://phabricator.memgraph.io/D1982
This commit is contained in:
Matej Ferencevic 2019-04-24 16:57:26 +02:00
parent 2f066b3a83
commit 872b043bed
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/durability/distributed/recovery.cpp
View File

@ -291,7 +291,9 @@ bool RecoverSnapshot(const fs::path &snapshot_file, database::GraphDb *db,
// that does not interfere with that found in previous snapshots and WAL.
tx::TransactionId max_id = recovery_data->snapshooter_tx_id;
auto &snap = recovery_data->snapshooter_tx_snapshot;
if (!snap.empty()) max_id = *std::max_element(snap.begin(), snap.end());
if (!snap.empty()) {
max_id = std::max(max_id, *std::max_element(snap.begin(), snap.end()));
}
dba->db().tx_engine().EnsureNextIdGreater(max_id);
dba->Commit();
return true;

4
src/durability/single_node/recovery.cpp
View File

@ -249,7 +249,9 @@ bool RecoverSnapshot(const fs::path &snapshot_file, database::GraphDb *db,
// that does not interfere with that found in previous snapshots and WAL.
tx::TransactionId max_id = recovery_data->snapshooter_tx_id;
auto &snap = recovery_data->snapshooter_tx_snapshot;
if (!snap.empty()) max_id = *std::max_element(snap.begin(), snap.end());
if (!snap.empty()) {
max_id = std::max(max_id, *std::max_element(snap.begin(), snap.end()));
}
dba.db().tx_engine().EnsureNextIdGreater(max_id);
dba.Commit();
return true;

4
src/durability/single_node_ha/recovery.cpp
View File

@ -137,7 +137,9 @@ bool RecoverSnapshot(const fs::path &snapshot_file, database::GraphDb *db,
// that does not interfere with that found in previous snapshots.
tx::TransactionId max_id = recovery_data->snapshooter_tx_id;
auto &snap = recovery_data->snapshooter_tx_snapshot;
if (!snap.empty()) max_id = *std::max_element(snap.begin(), snap.end());
if (!snap.empty()) {
max_id = std::max(max_id, *std::max_element(snap.begin(), snap.end()));
}
dba.db()->tx_engine().EnsureNextIdGreater(max_id);
dba.Commit();
return true;