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

fix durability

Browse Source
This commit is contained in:
antoniofilipovic 2024-02-28 10:19:18 +01:00 committed by Antonio Filipovic
parent d861dbb0b6
commit 5136c80fda
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/storage/v2/durability/durability.cpp
View File

@ -418,17 +418,16 @@ std::optional<RecoveryInfo> Recovery::RecoverData(std::string *uuid, Replication
// We can also set the last timestamp to 0 if last loaded timestamp // We can also set the last timestamp to 0 if last loaded timestamp
// is nullopt as this can only happen if the WAL file with seq = 0 // is nullopt as this can only happen if the WAL file with seq = 0
// does not contain any deltas and we didn't find any snapshots. // does not contain any deltas and we didn't find any snapshots.
/*
if (last_loaded_timestamp) { if (last_loaded_timestamp) {
epoch_history->emplace_back(repl_storage_state.epoch_.id(), *last_loaded_timestamp); epoch_history->emplace_back(repl_storage_state.epoch_.id(), *last_loaded_timestamp);
} }
*/
for (auto &wal_file : wal_files) { for (auto &wal_file : wal_files) {
if (previous_seq_num && (wal_file.seq_num - *previous_seq_num) > 1) { if (previous_seq_num && (wal_file.seq_num - *previous_seq_num) > 1) {
LOG_FATAL("You are missing a WAL file with the sequence number {}!", *previous_seq_num + 1); LOG_FATAL("You are missing a WAL file with the sequence number {}!", *previous_seq_num + 1);
} }
previous_seq_num = wal_file.seq_num; previous_seq_num = wal_file.seq_num;
/*
if (wal_file.epoch_id != repl_storage_state.epoch_.id()) { if (wal_file.epoch_id != repl_storage_state.epoch_.id()) {
// This way we skip WALs finalized only because of role change. // This way we skip WALs finalized only because of role change.
// We can also set the last timestamp to 0 if last loaded timestamp // We can also set the last timestamp to 0 if last loaded timestamp
@ -439,6 +438,7 @@ std::optional<RecoveryInfo> Recovery::RecoverData(std::string *uuid, Replication
} }
repl_storage_state.epoch_.SetEpoch(std::move(wal_file.epoch_id)); repl_storage_state.epoch_.SetEpoch(std::move(wal_file.epoch_id));
} }
*/
try { try {
auto info = LoadWal(wal_file.path, &indices_constraints, last_loaded_timestamp, vertices, edges, name_id_mapper, auto info = LoadWal(wal_file.path, &indices_constraints, last_loaded_timestamp, vertices, edges, name_id_mapper,
edge_count, config.salient.items); edge_count, config.salient.items);
@ -448,7 +448,6 @@ std::optional<RecoveryInfo> Recovery::RecoverData(std::string *uuid, Replication
recovery_info.last_commit_timestamp = info.last_commit_timestamp; recovery_info.last_commit_timestamp = info.last_commit_timestamp;
/*
if (recovery_info.next_timestamp != 0) { if (recovery_info.next_timestamp != 0) {
last_loaded_timestamp.emplace(recovery_info.next_timestamp - 1); last_loaded_timestamp.emplace(recovery_info.next_timestamp - 1);
} }
@ -464,7 +463,6 @@ std::optional<RecoveryInfo> Recovery::RecoverData(std::string *uuid, Replication
if (last_epoch_bigger_timestamp) { if (last_epoch_bigger_timestamp) {
epoch_history->back().second = last_loaded_timestamp.value_or(0); epoch_history->back().second = last_loaded_timestamp.value_or(0);
} }
*/
} catch (const RecoveryFailure &e) { } catch (const RecoveryFailure &e) {
LOG_FATAL("Couldn't recover WAL deltas from {} because of: {}", wal_file.path, e.what()); LOG_FATAL("Couldn't recover WAL deltas from {} because of: {}", wal_file.path, e.what());

2
tests/integration/durability/runner.py
View File

@ -69,7 +69,7 @@ def execute_test(memgraph_binary, dump_binary, test_directory, test_type, write_
memgraph_args = [ memgraph_args = [
memgraph_binary, memgraph_binary,
"--storage-recover-on-startup", "--data-recovery-on-startup",
"--storage-properties-on-edges", "--storage-properties-on-edges",
"--data-directory", "--data-directory",
working_data_directory.name, working_data_directory.name,

2
tests/stress/durability
View File

@ -53,7 +53,7 @@ cmd = [
"--storage-snapshot-interval-sec=5", "--storage-snapshot-interval-sec=5",
"--storage-snapshot-retention-count=2", "--storage-snapshot-retention-count=2",
"--storage-wal-enabled=true", "--storage-wal-enabled=true",
"--storage-recover-on-startup=true", "--data-recovery-on-startup=true",
"--query-execution-timeout-sec=600", "--query-execution-timeout-sec=600",
"--bolt-server-name-for-init=Neo4j/v5.11.0 compatible graph database server - Memgraph", "--bolt-server-name-for-init=Neo4j/v5.11.0 compatible graph database server - Memgraph",
] ]