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

Jump to bottom

br: download sst again with no-crypt parameters when met decryption error for downloadSST #32847

Merged
merged 23 commits into from
Mar 17, 2022
Merged

br: download sst again with no-crypt parameters when met decryption error for downloadSST #32847

merged 23 commits into from
Mar 17, 2022

Conversation

joccau
Copy link
Member

@joccau joccau commented Mar 4, 2022 •
edited
Loading

What problem does this PR solve?

Issue Number: close #32423

Problem Summary:
If the SST file from backup crypt is not been encrypted，user will fail to restore because of failing to download sst.

What is changed and how it works?

  • br should try download SST with no-crypt when met this error in this case.
  • Simplify function( import() is too long and too complex to understand)

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

None

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Mar 4, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • YuJuncen
  • fengou1

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.

@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/needs-triage-completed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Mar 4, 2022
@joccau
Copy link
Member Author

joccau commented Mar 4, 2022

/cc @kennytm @3pointer @YuJuncen @fengou1 PTAL

@ti-chi-bot
Copy link
Member

@joccau: GitHub didn't allow me to request PR reviews from the following users: PTAL.

Note that only pingcap members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

/cc @kennytm @3pointer @YuJuncen @fengou1 PTAL

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 kubernetes/test-infra repository.

@sre-bot
Copy link
Contributor

sre-bot commented Mar 4, 2022 •
edited
Loading

Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/c5762925cb9f8ac2fb8de457a223dd71ec09ab65

@joccau joccau changed the title br: download sst again without crypt parameters when met decryption error br: download sst again with no-crypt parameters when met decryption error for downloadSST Mar 7, 2022
@joccau
Copy link
Member Author

joccau commented Mar 7, 2022

/run-br-integration-test

@joccau
Copy link
Member Author

joccau commented Mar 7, 2022

/run-integration-br-test

1 similar comment
@joccau
Copy link
Member Author

joccau commented Mar 7, 2022

/run-integration-br-test

@joccau
Copy link
Member Author

joccau commented Mar 7, 2022

/run-integration-br-test

fengou1
fengou1 approved these changes Mar 10, 2022
View reviewed changes
Copy link
Contributor

@fengou1 fengou1 left a comment

Choose a reason for hiding this comment

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

go concurrency, go routines fetch local variables, it possible update on next iterator cause problem

@ti-chi-bot ti-chi-bot added status/LGT1 Indicates that a PR has LGTM 1. and removed do-not-merge/needs-triage-completed labels Mar 10, 2022
YuJuncen
YuJuncen approved these changes Mar 16, 2022
View reviewed changes
Copy link
Contributor

@YuJuncen YuJuncen left a comment

Choose a reason for hiding this comment

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

rest lgtm

br/pkg/restore/import.go Outdated Show resolved Hide resolved
@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Mar 16, 2022
@joccau
Copy link
Member Author

joccau commented Mar 17, 2022

/run-integration-br-test

@3pointer
Copy link
Contributor

/run-integration-br-test

@joccau
Copy link
Member Author

joccau commented Mar 17, 2022

/run-integration-br-test

@kennytm
Copy link
Contributor

kennytm commented Mar 17, 2022

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: c576292

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 17, 2022
@ti-chi-bot ti-chi-bot merged commit dcafe8e into pingcap:master Mar 17, 2022
@ti-srebot ti-srebot mentioned this pull request Mar 17, 2022
Merged
12 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.3 in PR #33196

@ti-srebot ti-srebot mentioned this pull request Mar 17, 2022
Merged
12 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.4 in PR #33197

@3pointer 3pointer mentioned this pull request Mar 17, 2022
Merged
12 tasks
sleepymole pushed a commit to ti-srebot/tidb that referenced this pull request Apr 28, 2022
@joccau @sleepymole
cherry-pick pingcap#32847
533e793 
Signed-off-by: joccau <[email protected]>
ti-chi-bot pushed a commit that referenced this pull request Apr 28, 2022
@ti-srebot
br: download sst again with no-crypt parameters when met decryption e…
0282edf 
…rror for downloadSST (#32847) (#33197)

close #32423
joccau pushed a commit to ti-srebot/tidb that referenced this pull request Jun 15, 2022
@ti-srebot @joccau
br: download sst again with no-crypt parameters when met decryption e…
ece9fd1 
…rror for downloadSST (pingcap#32847) (pingcap#33197)

close pingcap#32423
ti-chi-bot pushed a commit that referenced this pull request Jun 17, 2022
@ti-srebot
br: download sst again with no-crypt parameters when met decryption e…
3602e70 
…rror for downloadSST (#32847) (#33196)

close #32423
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@3pointer 3pointer 3pointer left review comments

@fengou1 fengou1 fengou1 approved these changes

@YuJuncen YuJuncen YuJuncen approved these changes

@kennytm kennytm Awaiting requested review from kennytm

Assignees
No one assigned
Labels
needs-cherry-pick-release-5.3 Type: Need cherry pick to release-5.3 needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. release-note-none Denotes a PR that doesn't merit a release note. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

br restore encrypted backup failed "Bad table magic number
8 participants
@joccau @ti-chi-bot @sre-bot @3pointer @kennytm @ti-srebot @YuJuncen @fengou1