client, tests: make client check if the cluster ID matches #5281

JmPotato · 2022-07-06T16:44:36Z

Signed-off-by: JmPotato ghzpotato@gmail.com

What problem does this PR solve?

Issue Number: Close #5278.

What is changed and how does it work?

Let the client check if the cluster ID matches during the initialization and updating.

Check List

Tests

Unit test
Integration test

Release note

None.

Signed-off-by: JmPotato <ghzpotato@gmail.com>

ti-chi-bot · 2022-07-06T16:44:40Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

lhy1024
rleungx

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.

codecov · 2022-07-06T16:57:14Z

Codecov Report

Merging #5281 (ae0b365) into master (de5cf5b) will increase coverage by 0.01%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master    #5281      +/-   ##
==========================================
+ Coverage   75.63%   75.65%   +0.01%     
==========================================
  Files         310      310              
  Lines       30718    30730      +12     
==========================================
+ Hits        23234    23249      +15     
- Misses       5483     5492       +9     
+ Partials     2001     1989      -12

Flag	Coverage Δ
unittests	`75.65% <100.00%> (+0.01%)`	⬆️

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

Impacted Files	Coverage Δ
client/client.go	`68.51% <ø> (-0.11%)`	⬇️
client/base_client.go	`82.03% <100.00%> (+2.65%)`	⬆️
pkg/dashboard/keyvisual/input/core.go	`0.00% <0.00%> (-33.34%)`	⬇️
server/schedulers/shuffle_hot_region.go	`55.55% <0.00%> (-10.11%)`	⬇️
server/tso/local_allocator.go	`64.86% <0.00%> (-6.76%)`	⬇️
server/id/id.go	`76.19% <0.00%> (-4.77%)`	⬇️
server/schedule/labeler/rules.go	`87.50% <0.00%> (-2.28%)`	⬇️
server/storage/hot_region_storage.go	`78.14% <0.00%> (-1.10%)`	⬇️
server/region_syncer/server.go	`86.41% <0.00%> (-1.09%)`	⬇️
server/cluster/coordinator.go	`70.45% <0.00%> (-0.59%)`	⬇️
... and 18 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 de5cf5b...ae0b365. Read the comment docs.

bufferflies · 2022-07-07T02:28:40Z

client/base_client.go

-
+		// Check the cluster ID.
+		if err == nil && members.GetHeader().GetClusterId() != c.clusterID {
+			err = errs.ErrClientUpdateMember.FastGenByArgs("cluster id does not match")


why not use "errors.WithStack(errUnmatchedClusterID)"?

I think it's because errUnmatchedClusterID is an error that will be returned to the upper caller, e.g, the TiDB. So it's not wrapped by the errs definition. However, in this function, it's an error that will be logged out, so it's necessary to wrap it first.

crelax · 2022-07-07T02:47:56Z

Hi, may I ask what's the expected behavior if some PD addresses are not connectable?

JmPotato · 2022-07-07T02:53:29Z

Hi, may I ask what's the expected behavior if some PD addresses are not connectable?

I didn't add special handling logic for this because it's hard to tell if "unreachable" is a temporary state or a permanent error from the client's point of view. Given the availability, as long as there is a working PD address in it, then I think the client is ready to start. It is unacceptable to deny the entire service just because of an unreachable URL.

Signed-off-by: JmPotato <ghzpotato@gmail.com>

JmPotato · 2022-07-07T04:30:22Z

/merge

ti-chi-bot · 2022-07-07T04:30:22Z

@JmPotato: 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 · 2022-07-07T04:30:24Z

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

Commit hash: ae0b365

crelax · 2022-07-07T05:39:48Z

Hi, may I ask what's the expected behavior if some PD addresses are not connectable?

I didn't add special handling logic for this because it's hard to tell if "unreachable" is a temporary state or a permanent error from the client's point of view. Given the availability, as long as there is a working PD address in it, then I think the client is ready to start. It is unacceptable to deny the entire service just because of an unreachable URL.

Got it. Thx for the explanation!

close tikv#5278 Let the client check if the cluster ID matches during the initialization and updating. Signed-off-by: JmPotato <ghzpotato@gmail.com>

Make client check if the cluster ID matches

189619d

Signed-off-by: JmPotato <ghzpotato@gmail.com>

JmPotato added the component/client Client logic. label Jul 6, 2022

JmPotato requested review from nolouch, HunDunDM and rleungx July 6, 2022 16:44

ti-chi-bot added the release-note-none Denotes a PR that doesn't merit a release note. label Jul 6, 2022

bufferflies reviewed Jul 7, 2022

View reviewed changes

lhy1024 approved these changes Jul 7, 2022

View reviewed changes

ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 7, 2022

Refine the error test

ae0b365

Signed-off-by: JmPotato <ghzpotato@gmail.com>

rleungx approved these changes Jul 7, 2022

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 Jul 7, 2022

ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 7, 2022

ti-chi-bot merged commit 0c3303e into tikv:master Jul 7, 2022

JmPotato deleted the client_check_cluster_id branch July 7, 2022 04:36

This was referenced Jul 25, 2022

go.mod: update pd/client tikv/client-go#554

Merged

*: update pd-client to ensure tidb-server get clusterID correctly pingcap/tidb#36524

Merged

ti-srebot mentioned this pull request Jul 25, 2022

*: update pd-client to ensure tidb-server get clusterID correctly (#36524) pingcap/tidb#36539

Merged

12 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

client, tests: make client check if the cluster ID matches #5281

client, tests: make client check if the cluster ID matches #5281

JmPotato commented Jul 6, 2022

ti-chi-bot commented Jul 6, 2022 •

edited

Loading

codecov bot commented Jul 6, 2022 •

edited

Loading

bufferflies Jul 7, 2022

JmPotato Jul 7, 2022

crelax commented Jul 7, 2022

JmPotato commented Jul 7, 2022

JmPotato commented Jul 7, 2022

ti-chi-bot commented Jul 7, 2022

ti-chi-bot commented Jul 7, 2022

crelax commented Jul 7, 2022

client, tests: make client check if the cluster ID matches #5281

client, tests: make client check if the cluster ID matches #5281

Conversation

JmPotato commented Jul 6, 2022

What problem does this PR solve?

What is changed and how does it work?

Check List

Release note

ti-chi-bot commented Jul 6, 2022 • edited Loading

codecov bot commented Jul 6, 2022 • edited Loading

Codecov Report

bufferflies Jul 7, 2022

Choose a reason for hiding this comment

JmPotato Jul 7, 2022

Choose a reason for hiding this comment

crelax commented Jul 7, 2022

JmPotato commented Jul 7, 2022

JmPotato commented Jul 7, 2022

ti-chi-bot commented Jul 7, 2022

ti-chi-bot commented Jul 7, 2022

crelax commented Jul 7, 2022

ti-chi-bot commented Jul 6, 2022 •

edited

Loading

codecov bot commented Jul 6, 2022 •

edited

Loading