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

fix: add a new check for encryption during the volume snapshot restore #4914

Merged
merged 10 commits into from
Mar 7, 2023

Conversation

fengou1
Copy link
Contributor

@fengou1 fengou1 commented Feb 28, 2023

What problem does this PR solve?

Add a new check for volume snapshot restore

Closes #4913

What is changed and how does it work?

Code changes

  • Has Go code change
  • Has CI related scripts change

Tests

  • Unit test
  • E2E test
  • Manual test
  • No code

Side effects

  • Breaking backward compatibility
  • Other side effects:

Related changes

  • Need to cherry-pick to the release branch
  • Need to update the documentation

Release Notes

Please refer to Release Notes Language Style Guide before writing the release note.


@ti-chi-bot
Copy link
Member

ti-chi-bot commented Feb 28, 2023

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • WangLe1321
  • WizardXiao

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.

@fengou1 fengou1 requested review from WangLe1321 and WizardXiao and removed request for july2993 and handlerww February 28, 2023 02:28
@fengou1 fengou1 self-assigned this Feb 28, 2023
pkg/backup/restore/restore_manager.go Outdated Show resolved Hide resolved
pkg/backup/restore/restore_manager.go Outdated Show resolved Hide resolved
pkg/backup/restore/restore_manager.go Outdated Show resolved Hide resolved
pkg/backup/restore/restore_manager.go Show resolved Hide resolved
@codecov-commenter
Copy link

codecov-commenter commented Feb 28, 2023

Codecov Report

Merging #4914 (0ad6a5e) into master (c92ff56) will increase coverage by 8.44%.
The diff coverage is 18.18%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #4914      +/-   ##
==========================================
+ Coverage   59.12%   67.56%   +8.44%     
==========================================
  Files         227      231       +4     
  Lines       26243    29440    +3197     
==========================================
+ Hits        15516    19891    +4375     
+ Misses       9237     8022    -1215     
- Partials     1490     1527      +37     
Flag Coverage Δ
e2e 51.57% <0.00%> (?)
unittest 59.08% <28.57%> (-0.04%) ⬇️

@fengou1
Copy link
Contributor Author

fengou1 commented Mar 1, 2023

/cc @WangLe1321

@fengou1
Copy link
Contributor Author

fengou1 commented Mar 4, 2023

/test pull-e2e-kind-across-kubernetes pull-e2e-kind-basic pull-e2e-kind-tikv-scale-simultaneously pull-e2e-kind-tngm

@fengou1
Copy link
Contributor Author

fengou1 commented Mar 4, 2023

/test pull-e2e-kind-basic

@fengou1
Copy link
Contributor Author

fengou1 commented Mar 4, 2023

/test pull-e2e-kind pull-e2e-kind-across-kubernetes

@fengou1
Copy link
Contributor Author

fengou1 commented Mar 7, 2023

/test pull-e2e-kind-serial

@fengou1
Copy link
Contributor Author

fengou1 commented Mar 7, 2023

/test pull-e2e-kind-serial

@fengou1
Copy link
Contributor Author

fengou1 commented Mar 7, 2023

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 0ad6a5e

@ti-chi-bot ti-chi-bot merged commit 9f5c437 into pingcap:master Mar 7, 2023
luohao pushed a commit to luohao/tidb-operator that referenced this pull request Mar 7, 2023
WizardXiao pushed a commit to WizardXiao/tidb-operator that referenced this pull request Mar 10, 2023
WizardXiao added a commit that referenced this pull request Mar 11, 2023
* feat: support tiflash backup and restore during volume snapshot (#4812)

* feat: calc the backup size from snapshot storage usage (#4819)

* fix backup failed when pod was auto restarted by k8s (#4883)

* init code for test

* just clean before backup data

* delete test code

* import pingcap/errors

* add check version

* remove test code

* add running status check

* add restart condition to clarify logic

* fix status update

* fix ut

* br: ensure pvc names sequential for ebs restore (#4888)

* BR: Restart backup when backup job/pod unexpected failed by k8s (#4895)

* init code for test

* just clean before backup data

* delete test code

* import pingcap/errors

* add check version

* remove test code

* add running status check

* add restart condition to clarify logic

* fix status update

* fix ut

* init code

* update crd reference

* fix miss update retry count

* add retry limit as constant

* init runnable code

* refine main controller logic

* add some note

* address some comments

* init e2e test code

* add e2e env to extend backup time

* add e2e env for test

* fix complie

* just test kill pod

* refine logic

* use pkill to kill pod

* fix reconcile

* add kill pod log

* add more log

* add more log

* try kill pod only

* wait and kill running backup pod

* add wait for pod failed

* fix wait pod running

* use killall backup to kill pod

* use pkill -9 backup

* kill pod until pod is failed

* add ps to debug

* connect commands by semicolon

* kill pod by signal 15

* use panic simulate kill pod

* test all kill pod test

* remove useless log

* add original reason of job or pod failure

* rename BackupRetryFailed to BackupRetryTheFailed

* BR: Auto truncate log backup in backup schedule (#4904)

* init schedule log backup code

* add run log backup code

* update api

* refine some nodes

* refine cacluate logic

* add ut

* fix make check

* add log backup test

* refine code

* fix notes

* refine function names

* fix conflict

* fix: add a new check for encryption during the volume snapshot restore (#4914)

* br: volume-snapshot may lead to a panic when there is no block change between two snapshot (#4922)

* br: refine BackoffRetryPolicy time format (#4925)

* refine BackoffRetryPolicy time format

* fix some ut

---------

Co-authored-by: fengou1 <[email protected]>
Co-authored-by: WangLe1321 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

br: add a new check for tikv encryption during the volume-snapshot restore
5 participants