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

*: fix urls cannot take effect when setting in the config file (#6189) #6191

Merged
merged 2 commits into from
Mar 21, 2023
Merged

*: fix urls cannot take effect when setting in the config file (#6189) #6191

merged 2 commits into from
Mar 21, 2023

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #6189

What problem does this PR solve?

Issue Number: Fixes #6190.

What is changed and how does it work?

This PR fixes the problem accidentally introduced by #6004.

Check List

Tests

  • Manual test

config.toml:

client-urls = "http://127.0.0.1:22379"
peer-urls = "http://127.0.0.1:22380"
bin/pd-server --config=config.toml

Release note

None.

@rleungx @ti-chi-bot
fix config file setting
329fa47 
Signed-off-by: Ryan Leung <rleungx@gmail.com>
@ti-chi-bot ti-chi-bot mentioned this pull request Mar 21, 2023
Merged
@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Mar 21, 2023 •
edited
Loading

[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.

@rleungx
Copy link
Member

rleungx commented Mar 21, 2023

/retest

@rleungx
Copy link
Member

rleungx commented Mar 21, 2023

/run-all-tests

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

codecov bot commented Mar 21, 2023

Codecov Report

Patch coverage has no change and project coverage change: +0.09 🎉

Comparison is base (37cc8de) 74.50% compared to head (1bb10fd) 74.59%.

Additional details and impacted files 
@@               Coverage Diff               @@
##           release-7.0    #6191      +/-   ##
===============================================
+ Coverage        74.50%   74.59%   +0.09%     
===============================================
  Files              393      393              
  Lines            38636    38636              
===============================================
+ Hits             28784    28822      +38     
+ Misses            7301     7279      -22     
+ Partials          2551     2535      -16
Flag Coverage Δ
unittests 74.59% <ø> (+0.09%) ⬆️

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

see 22 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@rleungx
Copy link
Member

rleungx commented Mar 21, 2023

/merge

1 similar comment
@lhy1024
Copy link
Contributor

lhy1024 commented Mar 21, 2023

/merge

@ti-chi-bot
Copy link
Member Author

@rleungx: 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

@lhy1024: 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: 1bb10fd

1 similar comment
@ti-chi-bot
Copy link
Member Author

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

Commit hash: 1bb10fd

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 21, 2023
@ti-chi-bot ti-chi-bot merged commit f46f6b3 into tikv:release-7.0 Mar 21, 2023
CabinfeverB pushed a commit to ti-chi-bot/pd that referenced this pull request Mar 22, 2023
@ti-chi-bot @rleungx
@lhy1024 @CabinfeverB
*: fix urls cannot take effect when setting in the config file (tikv#…
c431d3f 
…6189) (tikv#6191)

ref tikv#6004, ref tikv#6189, fixes tikv#6190

Signed-off-by: Ryan Leung <rleungx@gmail.com>

Co-authored-by: Ryan Leung <rleungx@gmail.com>
Co-authored-by: lhy1024 <admin@liudos.us>
Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>
CabinfeverB pushed a commit to ti-chi-bot/pd that referenced this pull request Mar 22, 2023
@ti-chi-bot @rleungx
@lhy1024 @CabinfeverB
*: fix urls cannot take effect when setting in the config file (tikv#…
94902a7 
…6189) (tikv#6191)

ref tikv#6004, ref tikv#6189, fixes tikv#6190

Signed-off-by: Ryan Leung <rleungx@gmail.com>

Co-authored-by: Ryan Leung <rleungx@gmail.com>
Co-authored-by: lhy1024 <admin@liudos.us>
Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>
@VelocityLight VelocityLight added do-not-merge/cherry-pick-not-approved cherry-pick-approved Cherry pick PR approved by release team. and removed cherry-pick-approved Cherry pick PR approved by release team. do-not-merge/cherry-pick-not-approved labels Mar 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lhy1024 lhy1024 lhy1024 approved these changes

@rleungx rleungx rleungx approved these changes

@nolouch nolouch Awaiting requested review from nolouch

Assignees

@rleungx rleungx

Labels
cherry-pick-approved Cherry pick PR approved by release team. 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. type/cherry-pick-for-release-7.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ti-chi-bot @rleungx @lhy1024 @VelocityLight