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

[bug fix] Take into account PD peer port and PD client port when pdAddresses from TidbCluster manifest used over Discovery service in pd, tidb and tikv startup scripts #5438

Merged
merged 33 commits into from
Dec 6, 2023

Conversation

smineyev81
Copy link
Contributor

What problem does this PR solve?

Currently non default security scheme nor PD peer port nor PD client port are taken into account by startup scripts if pdAddresses from TidbCluster manifest used over Discovery service

What is changed and how does it work?

Adds support of non default scheme, PD peer port and PD client to startup scripts v2

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

NONE

smineyev81 and others added 28 commits November 7, 2023 13:30
This reverts commit 6a9990a.
@codecov-commenter
Copy link

codecov-commenter commented Dec 4, 2023

Codecov Report

Merging #5438 (13db432) into master (30d7599) will increase coverage by 0.00%.
The diff coverage is 80.00%.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #5438   +/-   ##
=======================================
  Coverage   61.41%   61.41%           
=======================================
  Files         228      228           
  Lines       29102    29114   +12     
=======================================
+ Hits        17872    17881    +9     
- Misses       9472     9473    +1     
- Partials     1758     1760    +2     
Flag Coverage Δ
unittest 61.41% <80.00%> (+<0.01%) ⬆️

@smineyev81 smineyev81 changed the title [bug fix] Take into account scheme, PD peer port and PD client port when pdAddresses from TidbCluster manifest used over Discovery service in pd, tidb and tikv startup scripts [bug fix] Take into account PD peer port and PD client port when pdAddresses from TidbCluster manifest used over Discovery service in pd, tidb and tikv startup scripts Dec 4, 2023
@ti-chi-bot ti-chi-bot bot added the lgtm label Dec 6, 2023
Copy link
Contributor

ti-chi-bot bot commented Dec 6, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: csuzhangxc

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Copy link
Contributor

ti-chi-bot bot commented Dec 6, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-12-06 04:04:01.445341531 +0000 UTC m=+1586670.110567725: ☑️ agreed by csuzhangxc.

@ti-chi-bot ti-chi-bot bot added the approved label Dec 6, 2023
@csuzhangxc
Copy link
Member

it's better to add manual test steps in the PR description.

@csuzhangxc csuzhangxc merged commit 0c527c5 into pingcap:master Dec 6, 2023
@csuzhangxc
Copy link
Member

/cherry-pick release-1.5

@ti-chi-bot
Copy link
Member

@csuzhangxc: new pull request created to branch release-1.5: #5444.

In response to this:

/cherry-pick release-1.5

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 pushed a commit to ti-chi-bot/tidb-operator that referenced this pull request Dec 6, 2023
…dresses from TidbCluster manifest used over Discovery service in pd, tidb and tikv startup scripts (pingcap#5438)
csuzhangxc pushed a commit that referenced this pull request Dec 6, 2023
…dresses from TidbCluster manifest used over Discovery service in pd, tidb and tikv startup scripts (#5438) (#5444)

Co-authored-by: Sergey <[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.

4 participants