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: refine key manager watcher loop (#4111) #4154

Merged
merged 5 commits into from
Nov 30, 2021

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #4111

What problem does this PR solve?

Fix #4071

What is changed and how it works?

encryption: refine key manager watcher loop

Check List

Tests

  • Unit test

Code changes

Side effects

Related changes

  • Need to cherry-pick to the release branch

Release note

None

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Sep 24, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • HunDunDM
  • JmPotato

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 do-not-merge/cherry-pick-not-approved release-note-none Denotes a PR that doesn't merit a release note. component/security Security logic. type/bugfix This PR fixes a bug. type/cherry-pick-for-release-5.0 The PR belongs to release-5.0 cherry pick. labels Sep 24, 2021
Signed-off-by: HunDunDM <hundundm@gmail.com>
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Sep 26, 2021
@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 Sep 26, 2021
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Nov 30, 2021
@nolouch
Copy link
Contributor

nolouch commented Nov 30, 2021

/merge

@ti-chi-bot
Copy link
Member Author

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

/run-all-tests

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
Member Author

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

Commit hash: 87d111c

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 30, 2021
@ti-chi-bot
Copy link
Member Author

@ti-chi-bot: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

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.

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.

@nolouch
Copy link
Contributor

nolouch commented Nov 30, 2021

/merge

@ti-chi-bot
Copy link
Member Author

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

/run-all-tests

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
Member Author

[FORMAT CHECKER NOTIFICATION]

Please provide the associated issue number in the commit messages, for example: close #12345, or ref #12345.

@nolouch
Copy link
Contributor

nolouch commented Nov 30, 2021

@HunDunDM ci failed.

@nolouch
Copy link
Contributor

nolouch commented Nov 30, 2021

/run-unit-tests

2 similar comments
@nolouch
Copy link
Contributor

nolouch commented Nov 30, 2021

/run-unit-tests

@nolouch
Copy link
Contributor

nolouch commented Nov 30, 2021

/run-unit-tests

@codecov
Copy link

codecov bot commented Nov 30, 2021

Codecov Report

Merging #4154 (da649a5) into release-5.0 (d109f28) will increase coverage by 0.00%.
The diff coverage is 67.74%.

Impacted file tree graph

@@             Coverage Diff              @@
##           release-5.0    #4154   +/-   ##
============================================
  Coverage        74.80%   74.80%           
============================================
  Files              245      245           
  Lines            24327    24336    +9     
============================================
+ Hits             18197    18204    +7     
+ Misses            4516     4513    -3     
- Partials          1614     1619    +5     
Flag Coverage Δ
unittests 74.80% <67.74%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
server/encryptionkm/key_manager.go 72.80% <67.74%> (-0.65%) ⬇️
server/tso/global_allocator.go 71.01% <0.00%> (-6.53%) ⬇️
server/schedule/region_scatterer.go 83.87% <0.00%> (-4.61%) ⬇️
pkg/dashboard/adapter/manager.go 78.72% <0.00%> (-4.26%) ⬇️
pkg/btree/btree.go 85.30% <0.00%> (-0.97%) ⬇️
server/config/persist_options.go 91.43% <0.00%> (-0.78%) ⬇️
server/cluster/cluster.go 82.01% <0.00%> (-0.39%) ⬇️
client/client.go 71.96% <0.00%> (-0.28%) ⬇️
server/server.go 72.89% <0.00%> (ø)
... and 9 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d109f28...da649a5. Read the comment docs.

@nolouch nolouch merged commit a4a4c5a into tikv:release-5.0 Nov 30, 2021
@zhouqiang-cl zhouqiang-cl added this to the v5.0.6 milestone Dec 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. component/security Security logic. do-not-merge/invalid-commit-message release-note-none Denotes a PR that doesn't merit a release note. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. triage/accept type/bugfix This PR fixes a bug. type/cherry-pick-for-release-5.0 The PR belongs to release-5.0 cherry pick.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants