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.

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

encryption: fix key collision issue in tablet snapshot #15098

Merged
merged 3 commits into from
Jul 18, 2023

Conversation

tabokie
Copy link
Member

@tabokie tabokie commented Jul 10, 2023

What is changed and how it works?

Issue Number: Close #15059

What's Changed:

- Properly clean up encryption keys when cleaning up snapshot cache file.
- Allow overwriting stale encryption keys when importing remote keys.

Related changes

Check List

Tests

  • Unit test

Release note

None

Signed-off-by: tabokie <xy.tao@outlook.com>
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Jul 10, 2023

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • overvenus
  • tonyxuqqi

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

Comment on lines 316 to 319
fs::remove_file(entry.path())?;
if let Some(m) = key_manager {
m.delete_file(entry.path().to_str().unwrap())?;
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there any EncryptedFilesystem? Maybe we can wrap these two remove-file in EncryptedFilesystem::remove_file?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe in another PR, file_system is a drop-in replacement for std::fs, but remove_encrypted_file requires additional parameter, and it can't be placed in file_system crate due to cyclic dependency.

@ti-chi-bot ti-chi-bot bot added the status/LGT1 Status: PR - There is already 1 approval label Jul 11, 2023
@ti-chi-bot ti-chi-bot bot added status/LGT2 Status: PR - There are already 2 approvals and removed status/LGT1 Status: PR - There is already 1 approval labels Jul 14, 2023
@tonyxuqqi
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Jul 18, 2023

@tonyxuqqi: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and if the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

If you have any questions about the PR merge process, please refer to pr process.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Jul 18, 2023

This pull request has been accepted and is ready to merge.

Commit hash: d7e574e

@ti-chi-bot ti-chi-bot bot added the status/can-merge Status: Can merge to base branch label Jul 18, 2023
Signed-off-by: tabokie <xy.tao@outlook.com>
@ti-chi-bot ti-chi-bot bot removed the status/can-merge Status: Can merge to base branch label Jul 18, 2023
@tabokie
Copy link
Member Author

tabokie commented Jul 18, 2023

/merge

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Jul 18, 2023

@tabokie: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and if the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

If you have any questions about the PR merge process, please refer to pr process.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Jul 18, 2023

This pull request has been accepted and is ready to merge.

Commit hash: 9adf331

@ti-chi-bot ti-chi-bot bot added the status/can-merge Status: Can merge to base branch label Jul 18, 2023
@ti-chi-bot ti-chi-bot bot merged commit c16cab2 into tikv:master Jul 18, 2023
7 checks passed
@ti-chi-bot ti-chi-bot bot added this to the Pool milestone Jul 18, 2023
@tabokie tabokie deleted the 230710-fix-name-collision branch July 18, 2023 09:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note-none size/M status/can-merge Status: Can merge to base branch status/LGT2 Status: PR - There are already 2 approvals
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Dynamic Regions] raft log lag more and more after inject one tikv network partition for 50m and recover
3 participants