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

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

Merged
merged 1 commit into from
Jul 25, 2022
Merged

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

merged 1 commit into from
Jul 25, 2022

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Jul 25, 2022 •
edited
Loading

cherry-pick #36524 to release-6.2
You can switch your code base to this Pull Request by using git-extras:

# In tidb repo:
git pr https://github.com/pingcap/tidb/pull/36539

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/tidb.git pr/36539:release-6.2-e2f1ba9b7eb8

What problem does this PR solve?

Issue Number: close #36478, close #36505

Problem Summary: pd-client get clusterID equals to 0 caused tidb-server start failed.
I think the problem is caused by tikv/pd#5310, but the tikv/pd#5281 and tikv/pd#5310 already fixed this problem, so update pd-client is enough.

What is changed and how it works?

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
start tiup playground with new tidb many times without any failed.
  • 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

Please refer to Release Notes Language Style Guide to write a quality release note.

update pd-client

@Defined2014 @ti-srebot
cherry pick pingcap#36524 to release-6.2
1d2c050 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

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

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • Defined2014
  • xiongjiwei

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-srebot
Copy link
Contributor Author

/run-all-tests

@ti-chi-bot ti-chi-bot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Jul 25, 2022
@ti-srebot ti-srebot mentioned this pull request Jul 25, 2022
Merged
12 tasks
@ti-srebot ti-srebot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/6.2-cherry-pick labels Jul 25, 2022
@ti-srebot
Copy link
Contributor Author

@Defined2014 you're already a collaborator in bot's repo.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 25, 2022
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Jul 25, 2022
@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 Jul 25, 2022
@Defined2014
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 1d2c050

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 25, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Jul 25, 2022

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

@ti-chi-bot ti-chi-bot merged commit fce3ceb into pingcap:release-6.2 Jul 25, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xiongjiwei xiongjiwei xiongjiwei approved these changes

@Defined2014 Defined2014 Defined2014 approved these changes

@hawkingrei hawkingrei hawkingrei approved these changes

@JmPotato JmPotato Awaiting requested review from JmPotato

@sticnarf sticnarf Awaiting requested review from sticnarf

@xhebox xhebox Awaiting requested review from xhebox

Assignees

@Defined2014 Defined2014

Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 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. type/6.2-cherry-pick
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@ti-srebot @ti-chi-bot @Defined2014 @sre-bot @hawkingrei @xiongjiwei @VelocityLight