encryption: refine key manager watcher loop #4111

HunDunDM · 2021-09-13T11:07:24Z

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

ti-chi-bot · 2021-09-13T11:07:25Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

JmPotato
nolouch

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.

HunDunDM · 2021-09-13T11:08:54Z

cc @yiwu-arbug

server/encryptionkm/key_manager.go

yiwu-arbug · 2021-09-15T00:27:32Z

server/encryptionkm/key_manager.go

-			m.helper.eventAfterTicker()
+		}
+
+		select {


when server being shutdown, will it stop the watcher loop?

watcher.Watch uses ctx, when ctx is Done, it will break.

yiwu-arbug · 2021-09-15T00:28:00Z

server/encryptionkm/key_manager.go

+		for {
+			select {
+			case resp, ok = <-rch:
+				if !ok || resp.CompactRevision != 0 || resp.Canceled {


what does compact revision != 0 mean? It has been a while I forget most about etcd.

api#watch-streams

Compact_Revision - set to the minimum historical revision available to etcd if a watcher tries watching at a compacted revision. This happens when creating a watcher at a compacted revision or the watcher cannot catch up with the progress of the key-value store. The watcher will be canceled; creating new watches with the same start_revision will fail.

can you add inline comment about it?

I think you can use !ok || resp.Err() != nil directly.

ti-chi-bot · 2021-09-15T05:24:16Z

@yiwu-arbug: Thanks for your review. The bot only counts approvals from reviewers and higher roles in list, but you're still welcome to leave your comments.

In response to this:

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

rest lgtm

Signed-off-by: HunDunDM <hundundm@gmail.com>

nolouch · 2021-09-24T10:34:52Z

/merge

ti-chi-bot · 2021-09-24T10:34:52Z

@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 · 2021-09-24T10:34:54Z

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

Commit hash: ec196b1

codecov · 2021-09-24T10:44:09Z

Codecov Report

Merging #4111 (ec196b1) into master (62c6647) will increase coverage by 0.05%.
The diff coverage is 67.74%.

@@            Coverage Diff             @@
##           master    #4111      +/-   ##
==========================================
+ Coverage   74.37%   74.43%   +0.05%     
==========================================
  Files         260      260              
  Lines       26467    26476       +9     
==========================================
+ Hits        19686    19707      +21     
+ Misses       5000     4993       -7     
+ Partials     1781     1776       -5

Flag	Coverage Δ
unittests	`74.43% <67.74%> (+0.05%)`	⬆️

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%> (+1.01%)`	⬆️
pkg/dashboard/adapter/manager.go	`78.72% <0.00%> (-4.26%)`	⬇️
server/schedulers/random_merge.go	`60.00% <0.00%> (-3.34%)`	⬇️
pkg/etcdutil/etcdutil.go	`84.70% <0.00%> (-1.18%)`	⬇️
server/core/storage.go	`68.04% <0.00%> (-0.76%)`	⬇️
server/server.go	`71.40% <0.00%> (-0.60%)`	⬇️
server/schedule/placement/rule_manager.go	`83.95% <0.00%> (-0.58%)`	⬇️
server/tso/allocator_manager.go	`63.83% <0.00%> (-0.34%)`	⬇️
server/cluster/cluster.go	`82.33% <0.00%> (-0.24%)`	⬇️
... and 6 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 62c6647...ec196b1. Read the comment docs.

ti-chi-bot · 2021-09-24T10:45:21Z

In response to a cherrypick label: new pull request created: #4153.

ti-chi-bot · 2021-09-24T10:45:56Z

In response to a cherrypick label: new pull request created: #4154.

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

ti-chi-bot · 2021-09-24T10:46:33Z

In response to a cherrypick label: new pull request created: #4155.

* remove watcherEnabled Signed-off-by: HunDunDM <hundundm@gmail.com> * encryption: refine key manager watcher loop Signed-off-by: HunDunDM <hundundm@gmail.com> * fix log Signed-off-by: HunDunDM <hundundm@gmail.com> * add comment Signed-off-by: HunDunDM <hundundm@gmail.com> * add comment Signed-off-by: HunDunDM <hundundm@gmail.com> * address comment Signed-off-by: HunDunDM <hundundm@gmail.com> * *: use SerialSuites to reduce the servers in tests at the same time (#4171) Signed-off-by: HunDunDM <hundundm@gmail.com> Co-authored-by: HunDunDM <hundundm@gmail.com>

* remove watcherEnabled Signed-off-by: HunDunDM <hundundm@gmail.com> * encryption: refine key manager watcher loop Signed-off-by: HunDunDM <hundundm@gmail.com> * fix log Signed-off-by: HunDunDM <hundundm@gmail.com> * add comment Signed-off-by: HunDunDM <hundundm@gmail.com> * add comment Signed-off-by: HunDunDM <hundundm@gmail.com> * address comment Signed-off-by: HunDunDM <hundundm@gmail.com> Signed-off-by: hzh0425 <642256541@qq.com>

* This is an automated cherry-pick of #4111 Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

* encryption: refine key manager watcher loop Signed-off-by: HunDunDM <hundundm@gmail.com>

ti-chi-bot added the release-note-none Denotes a PR that doesn't merit a release note. label Sep 13, 2021

ti-chi-bot requested review from JmPotato and nolouch September 13, 2021 11:07

JmPotato approved these changes Sep 14, 2021

View reviewed changes

ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Sep 14, 2021

nolouch reviewed Sep 14, 2021

View reviewed changes

server/encryptionkm/key_manager.go Outdated Show resolved Hide resolved

yiwu-arbug reviewed Sep 15, 2021

View reviewed changes

yiwu-arbug approved these changes Sep 15, 2021

View reviewed changes

nolouch reviewed Sep 16, 2021

View reviewed changes

HunDunDM added 6 commits September 24, 2021 18:19

remove watcherEnabled

8f4865b

Signed-off-by: HunDunDM <hundundm@gmail.com>

encryption: refine key manager watcher loop

9420fcd

Signed-off-by: HunDunDM <hundundm@gmail.com>

fix log

1858ea2

Signed-off-by: HunDunDM <hundundm@gmail.com>

add comment

7e8dc03

Signed-off-by: HunDunDM <hundundm@gmail.com>

add comment

74a6601

Signed-off-by: HunDunDM <hundundm@gmail.com>

address comment

ec196b1

Signed-off-by: HunDunDM <hundundm@gmail.com>

HunDunDM force-pushed the fix-keymanager-deadloop branch from 5d7bb9a to ec196b1 Compare September 24, 2021 10:22

nolouch approved these changes Sep 24, 2021

View reviewed changes

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 24, 2021

ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 24, 2021

ti-chi-bot merged commit bab9092 into tikv:master Sep 24, 2021

HunDunDM deleted the fix-keymanager-deadloop branch September 24, 2021 10:44

ti-chi-bot mentioned this pull request Sep 24, 2021

encryption: refine key manager watcher loop (#4111) #4153

Merged

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Sep 24, 2021

This is an automated cherry-pick of tikv#4111

fa5a247

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

This was referenced Sep 24, 2021

encryption: refine key manager watcher loop (#4111) #4154

Merged

encryption: refine key manager watcher loop (#4111) #4155

Merged

HunDunDM mentioned this pull request Sep 26, 2021

ci failed runing too long TestWatcher #4165

Closed

nolouch pushed a commit that referenced this pull request Nov 30, 2021

encryption: refine key manager watcher loop (#4111) (#4154)

a4a4c5a

* This is an automated cherry-pick of #4111 Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

nolouch pushed a commit that referenced this pull request Nov 30, 2021

encryption: refine key manager watcher loop (#4111) (#4155)

32885c6

* encryption: refine key manager watcher loop Signed-off-by: HunDunDM <hundundm@gmail.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

encryption: refine key manager watcher loop #4111

encryption: refine key manager watcher loop #4111

HunDunDM commented Sep 13, 2021

ti-chi-bot commented Sep 13, 2021 •

edited

Loading

HunDunDM commented Sep 13, 2021

yiwu-arbug Sep 15, 2021

HunDunDM Sep 15, 2021

yiwu-arbug Sep 15, 2021

HunDunDM Sep 15, 2021

yiwu-arbug Sep 15, 2021

HunDunDM Sep 16, 2021

nolouch Sep 16, 2021 •

edited

Loading

ti-chi-bot commented Sep 15, 2021

nolouch left a comment

nolouch commented Sep 24, 2021

ti-chi-bot commented Sep 24, 2021

ti-chi-bot commented Sep 24, 2021

codecov bot commented Sep 24, 2021 •

edited

Loading

ti-chi-bot commented Sep 24, 2021

ti-chi-bot commented Sep 24, 2021

ti-chi-bot commented Sep 24, 2021

encryption: refine key manager watcher loop #4111

encryption: refine key manager watcher loop #4111

Conversation

HunDunDM commented Sep 13, 2021

What problem does this PR solve?

What is changed and how it works?

Check List

Release note

ti-chi-bot commented Sep 13, 2021 • edited Loading

HunDunDM commented Sep 13, 2021

yiwu-arbug Sep 15, 2021

Choose a reason for hiding this comment

HunDunDM Sep 15, 2021

Choose a reason for hiding this comment

yiwu-arbug Sep 15, 2021

Choose a reason for hiding this comment

HunDunDM Sep 15, 2021

Choose a reason for hiding this comment

yiwu-arbug Sep 15, 2021

Choose a reason for hiding this comment

HunDunDM Sep 16, 2021

Choose a reason for hiding this comment

nolouch Sep 16, 2021 • edited Loading

Choose a reason for hiding this comment

ti-chi-bot commented Sep 15, 2021

nolouch left a comment

Choose a reason for hiding this comment

nolouch commented Sep 24, 2021

ti-chi-bot commented Sep 24, 2021

ti-chi-bot commented Sep 24, 2021

codecov bot commented Sep 24, 2021 • edited Loading

Codecov Report

ti-chi-bot commented Sep 24, 2021

ti-chi-bot commented Sep 24, 2021

ti-chi-bot commented Sep 24, 2021

ti-chi-bot commented Sep 13, 2021 •

edited

Loading

nolouch Sep 16, 2021 •

edited

Loading

codecov bot commented Sep 24, 2021 •

edited

Loading