Skip to content
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

Fix dump snapshot encryption info not right after rename. #4840

Merged
merged 8 commits into from
May 7, 2022
Merged

Fix dump snapshot encryption info not right after rename. #4840

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
691efdf
Fix dump snapshot enc info problem.
jiaqizho May 7, 2022
0ec8d7e
fix
jiaqizho May 7, 2022
8efc009
change to fileprovider rename
jiaqizho May 7, 2022
bb234c4
Add ut
JaySon-Huang May 7, 2022
795e2c2
fix encryption
JaySon-Huang May 7, 2022
8a76fcd
error no
JaySon-Huang May 7, 2022
fc2b229
Merge branch 'master' into fix-wal-enc
ti-chi-bot May 7, 2022
cc79f60
Update dbms/src/Storages/Page/V3/tests/gtest_wal_store.cpp
JaySon-Huang May 7, 2022
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
6 changes: 6 additions & 0 deletions dbms/src/Storages/Page/V3/WALStore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,15 @@ bool WALStore::saveSnapshot(FilesSnapshot && files_snap, PageEntriesEdit && dire
// Rename it to be a normal log file.
const auto temp_fullname = log_filename.fullname(LogFileStage::Temporary);
const auto normal_fullname = log_filename.fullname(LogFileStage::Normal);

LOG_FMT_INFO(logger, "Renaming log file to be normal [fullname={}]", temp_fullname);
// Need link encryption info before rename
provider->linkEncryptionInfo(temp_fullname, normal_fullname);
jiaqizho marked this conversation as resolved.
Show resolved Hide resolved

auto f = Poco::File{temp_fullname};
f.renameTo(normal_fullname);
// Also need delete old encryption info after rename
provider->deleteEncryptionInfo(temp_fullname);
jiaqizho marked this conversation as resolved.
Show resolved Hide resolved
LOG_FMT_INFO(logger, "Rename log file to normal done [fullname={}]", normal_fullname);

// #define ARCHIVE_COMPACTED_LOGS // keep for debug
Expand Down