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

playground: add tiproxy #2202

Merged
merged 6 commits into from
Aug 23, 2023
Merged

playground: add tiproxy #2202

merged 6 commits into from
Aug 23, 2023

Conversation

xhebox
Copy link
Collaborator

@xhebox xhebox commented May 25, 2023

What problem does this PR solve?

What is changed and how it works?

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
    图片
  • No code

Code changes

  • Has exported function/method change
  • Has exported variable/fields change
  • Has interface methods change
  • Has persistent data change

Side effects

  • Possible performance regression
  • Increased code complexity
  • Breaking backward compatibility

Related changes

  • Need to cherry-pick to the release branch
  • Need to update the documentation

Release notes:

Add TiProxy support for playground

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented May 25, 2023

[REVIEW NOTIFICATION]

This pull request has not been approved.

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-chi-bot ti-chi-bot bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 25, 2023
@CLAassistant
Copy link

CLAassistant commented May 25, 2023 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@ti-chi-bot ti-chi-bot bot requested review from lucklove and srstack May 25, 2023 06:38
@ti-chi-bot ti-chi-bot bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label May 25, 2023
@codecov-commenter
Copy link

codecov-commenter commented May 25, 2023 •
edited
Loading

Codecov Report

Patch coverage: 27.66% and project coverage change: -5.85% ⚠️

Comparison is base (af2aa2a) 56.08% compared to head (2c69585) 50.23%.

❗ Current head 2c69585 differs from pull request most recent head d0f382e. Consider uploading reports for the commit d0f382e to get more accurate results

Additional details and impacted files 
@@            Coverage Diff             @@
##           master    #2202      +/-   ##
==========================================
- Coverage   56.08%   50.23%   -5.85%     
==========================================
  Files         320      320              
  Lines       33891    34006     +115     
==========================================
- Hits        19005    17080    -1925     
- Misses      12615    14687    +2072     
+ Partials     2271     2239      -32
Flag Coverage Δ
cluster 44.44% <ø> (-0.51%) ⬇️
dm 25.69% <ø> (ø)
playground 15.70% <27.66%> (-<0.01%) ⬇️
unittest ?

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

Files Changed Coverage Δ
components/playground/instance/tiproxy.go 0.00% <0.00%> (ø)
pkg/cluster/spec/instance.go 65.04% <ø> (ø)
components/playground/playground.go 46.04% <41.54%> (-1.55%) ⬇️
components/playground/command.go 80.13% <100.00%> (+0.68%) ⬆️
components/playground/main.go 59.42% <100.00%> (+0.55%) ⬆️

... and 58 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@xhebox xhebox changed the title [DNM] playground: add tiproxy playground: add tiproxy Jul 14, 2023
@xhebox xhebox marked this pull request as ready for review July 14, 2023 07:51
@ti-chi-bot ti-chi-bot bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 14, 2023
@ti-chi-bot ti-chi-bot bot requested a review from breezewish July 14, 2023 07:51
@ti-chi-bot ti-chi-bot bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 14, 2023
@xhebox
playground: add tiproxy
d668da2 
Signed-off-by: xhe <xw897002528@gmail.com>
@ti-chi-bot ti-chi-bot bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 18, 2023
@xhebox xhebox requested a review from kaaaaaaang July 18, 2023 06:37
@xhebox
fix
b816597 
Signed-off-by: xhe <xw897002528@gmail.com>
dveeden
dveeden reviewed Aug 16, 2023
View reviewed changes
components/playground/instance/tiproxy.go

config.Set("proxy.pd-addrs", strings.Join(endpoints, ","))
config.Set("proxy.addr", utils.JoinHostPort(c.Host, c.Port))
config.Set("proxy.require-backend-tls", false)
Copy link
Contributor

Choose a reason for hiding this comment

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

As TiUP Playground uses security.auto-tls=true, can we enable TLS to the backend? Or is this enabled, but just not enforced?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes, the latter. Just not enforced. When clients connects tiproxy with TLS, TLS is enabled.

@kaaaaaaang
Copy link
Collaborator

rest LGTM

xhebox and others added 2 commits August 21, 2023 14:53
@xhebox @dveeden
Update components/playground/playground.go
468f83d 
Co-authored-by: Daniël van Eeden <github@myname.nl>
@xhebox
revert default port
94edc9a 
Signed-off-by: xhe <xw897002528@gmail.com>
@xhebox
Copy link
Collaborator Author

xhebox commented Aug 21, 2023

rest LGTM

Done, PTAL

@kaaaaaaang
Copy link
Collaborator

/lgtm

@ti-chi-bot ti-chi-bot bot added the lgtm label Aug 22, 2023
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Aug 22, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-08-22 14:06:01.774009216 +0000 UTC m=+1244726.323025202: ☑️ agreed by kaaaaaaang.

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Aug 22, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kaaaaaaang

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

@ti-chi-bot ti-chi-bot bot added the approved label Aug 22, 2023
@ti-chi-bot ti-chi-bot bot merged commit a9580bd into pingcap:master Aug 23, 2023
18 checks passed
@shawn0915
Copy link

@xhebox
hi, could you help check again, if --tiproxy 0, then don't show waiting tiproxy ready better?

图片

@xhebox
Copy link
Collaborator Author

xhebox commented Aug 23, 2023

@xhebox hi, could you help check again, if --tiproxy 0, then don't show waiting tiproxy ready better?

图片

#2262

@xhebox xhebox mentioned this pull request Aug 23, 2023
Merged
@shawn0915
Copy link

@xhebox
hi again, could you help on this,
https://github.com/pingcap/tiup/pull/2202/files#diff-e14447fade4bdc6657816fd192d636c69c8e40eb38a9f9c3668595b8ad40661eR313

TiProxy will use 4000 as its port --> 6000?

@xhebox
Copy link
Collaborator Author

xhebox commented Aug 23, 2023

@xhebox hi again, could you help on this, https://github.com/pingcap/tiup/pull/2202/files#diff-e14447fade4bdc6657816fd192d636c69c8e40eb38a9f9c3668595b8ad40661eR313

TiProxy will use 4000 as its port --> 6000?

Done

@shawn0915
Copy link

@xhebox hi again, could you help on this, https://github.com/pingcap/tiup/pull/2202/files#diff-e14447fade4bdc6657816fd192d636c69c8e40eb38a9f9c3668595b8ad40661eR313
TiProxy will use 4000 as its port --> 6000?

Done

#2262

thank you. 6️⃣6️⃣6️⃣

@kaaaaaaang kaaaaaaang added this to the 1.13.0 milestone Aug 25, 2023
@dveeden dveeden mentioned this pull request Nov 14, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dveeden dveeden dveeden left review comments

@shawn0915 shawn0915 shawn0915 left review comments

@lucklove lucklove Awaiting requested review from lucklove

@srstack srstack Awaiting requested review from srstack

@breezewish breezewish Awaiting requested review from breezewish

@kaaaaaaang kaaaaaaang Awaiting requested review from kaaaaaaang

Assignees
No one assigned
Labels
approved lgtm size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
1.13.0
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@xhebox @CLAassistant @codecov-commenter @kaaaaaaang @shawn0915 @dveeden