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

don't set proxy addr default value in tiflash code #3539

Merged
merged 4 commits into from
Nov 26, 2021
Merged

don't set proxy addr default value in tiflash code #3539

merged 4 commits into from
Nov 26, 2021

Conversation

hehechen
Copy link
Contributor

@hehechen hehechen commented Nov 24, 2021 •
edited
Loading

What problem does this PR solve?

#3538

Problem Summary:
If flash.proxy.addr is set in tiflash-learner.toml, flash.proxy.addr will be incorrectly set to 127.0.0.1:20170 and the server.addr configuration in tiflash-learner.toml does not take effect.

What is changed and how it works?

Don't set proxy addr default value in tiflash code. Left it to be set in the proxy code: https://github.com/pingcap/tidb-engine-ext/blob/defbe27e00ac7b40c4987bb58f265099effda83f/src/server/config.rs#L22

Related changes

pingcap/tidb-engine-ext#38

Check List

Tests

  • Integration test

Release note 

None.

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Nov 24, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • JaySon-Huang

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.

@hehechen hehechen self-assigned this Nov 24, 2021
@ti-chi-bot ti-chi-bot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Nov 24, 2021
@ti-chi-bot ti-chi-bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Nov 24, 2021
@hehechen
Copy link
Contributor Author

/run-all-tests

@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Nov 24, 2021
@sre-bot
Copy link
Collaborator

sre-bot commented Nov 24, 2021

Coverage detail: https://ci-internal.pingcap.net/job/tics_ghpr_unit_test/134/cobertura/
(Coverage detail url is limited office network access)

lines: 35.5% (43332 out of 122148)
branches: 5.4% (65900 out of 1219969)

@hehechen
Copy link
Contributor Author

/run-all-tests

@sre-bot
Copy link
Collaborator

sre-bot commented Nov 24, 2021

Coverage detail: https://ci-internal.pingcap.net/job/tics_ghpr_unit_test/136/cobertura/
(Coverage detail url is limited office network access)

lines: 35.5% (43330 out of 122148)
branches: 5.4% (65902 out of 1219969)

JaySon-Huang
JaySon-Huang reviewed Nov 24, 2021
View reviewed changes
Copy link
Contributor

@JaySon-Huang JaySon-Huang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

File a PR to change these default ports ...
pingcap/tidb-engine-ext@6e72741
... to the ports that we defined in the official document
https://docs.pingcap.com/tidb/stable/hardware-and-software-requirements#network-requirements

dbms/src/Server/Server.cpp Show resolved Hide resolved
@hehechen
Copy link
Contributor Author

/rebuild

1 similar comment
@hehechen
Copy link
Contributor Author

/rebuild

@solotzg
Copy link
Contributor

solotzg commented Nov 24, 2021

https://github.com/pingcap/tics/blob/master/etc/config-template.toml#L111-L112
Need to change template file and other places using port 20181

@ti-chi-bot ti-chi-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Nov 25, 2021
@hehechen
Copy link
Contributor Author

/run-all-tests

@sre-bot
Copy link
Collaborator

sre-bot commented Nov 25, 2021

Coverage detail: https://ci-internal.pingcap.net/job/tics_ghpr_unit_test/161/cobertura/
(Coverage detail url is limited office network access)

lines: 35.5% (43338 out of 122148)
branches: 5.4% (65925 out of 1219969)

@hehechen
Copy link
Contributor Author

/run-integration-test

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 26, 2021
@hehechen
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

@hehechen: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and if the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

If you have any questions about the PR merge process, please refer to pr process.

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

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

Commit hash: 346c025

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 26, 2021
JaySon-Huang
JaySon-Huang reviewed Nov 26, 2021
View reviewed changes
etc/config-template.toml
@@ -108,8 +108,8 @@
# config = "/proxy.toml"
# log-file = "/log/proxy.log"
# log-level = "info"
# status-addr = "0.0.0.0:20181"
# advertise-status-addr = "tiflash0:20181"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Can also change these port in tests/docker/config/tiflash_dt.toml

@sre-bot
Copy link
Collaborator

sre-bot commented Nov 26, 2021

Coverage detail: https://ci-internal.pingcap.net/job/tics_ghpr_unit_test/169/cobertura/
(Coverage detail url is limited office network access)

lines: 35.6% (43453 out of 122207)
branches: 5.4% (66019 out of 1220255)

@ti-chi-bot ti-chi-bot merged commit f0b7634 into pingcap:master Nov 26, 2021
@JaySon-Huang JaySon-Huang deleted the fix_addr branch November 26, 2021 03:11
@solotzg
Copy link
Contributor

solotzg commented Nov 26, 2021

@hehechen the commit hash is illegal.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JaySon-Huang JaySon-Huang JaySon-Huang approved these changes

Assignees

@hehechen hehechen

Labels
release-note-none Denotes a PR that doesn't merit a release note. 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/LGT1 Indicates that a PR has LGTM 1.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@hehechen @ti-chi-bot @sre-bot @solotzg @JaySon-Huang