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

playground: tiproxy needs to override usercfg #2342

Merged
merged 4 commits into from
Dec 29, 2023
Merged

Conversation

xhebox
Copy link
Collaborator

@xhebox xhebox commented Dec 27, 2023

What problem does this PR solve?

Close #2339

previously, it doesnt override user config correctly leading to port conflicts when using custom configs for multiple tiproxy instances. TiDB pass ports by cli flags so then are fine.

Also, log-file is not passed

What is changed and how it works?

  1. use different logic than TiDB to generate configs.
  2. pass log-file

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:

NONE

@ti-chi-bot ti-chi-bot bot requested a review from breezewish December 27, 2023 10:07
@ti-chi-bot ti-chi-bot bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Dec 27, 2023
@codecov-commenter
Copy link

codecov-commenter commented Dec 27, 2023

Codecov Report

Attention: 16 lines in your changes are missing coverage. Please review.

Comparison is base (48b5119) 55.42% compared to head (4145baf) 55.05%.
Report is 1 commits behind head on master.

❗ Current head 4145baf differs from pull request most recent head 4df235a. Consider uploading reports for the commit 4df235a to get more accurate results

Files Patch % Lines
components/playground/instance/tiproxy.go 0.00% 16 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #2342      +/-   ##
==========================================
- Coverage   55.42%   55.05%   -0.37%     
==========================================
  Files         328      328              
  Lines       34828    34827       -1     
==========================================
- Hits        19300    19172     -128     
- Misses      13218    13356     +138     
+ Partials     2310     2299      -11     
Flag Coverage Δ
cluster 44.30% <ø> (-0.44%) ⬇️
dm 25.45% <ø> (-0.02%) ⬇️
playground 15.32% <0.00%> (+0.02%) ⬆️
tiup 33.56% <ø> (-0.05%) ⬇️
unittest 22.35% <ø> (ø)

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

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

@kaaaaaaang
Copy link
Collaborator

/lgtm

@ti-chi-bot ti-chi-bot bot added the lgtm label Dec 28, 2023
@kaaaaaaang kaaaaaaang added this to the v1.14.1 milestone Dec 28, 2023
@kaaaaaaang
Copy link
Collaborator

/approve

Copy link
Contributor

ti-chi-bot bot commented Dec 29, 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 Dec 29, 2023
@ti-chi-bot ti-chi-bot bot removed the lgtm label Dec 29, 2023
@kaaaaaaang
Copy link
Collaborator

/lgtm

@ti-chi-bot ti-chi-bot bot added the lgtm label Dec 29, 2023
Copy link
Contributor

ti-chi-bot bot commented Dec 29, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-12-28 09:10:40.996061608 +0000 UTC m=+1729732.033288530: ☑️ agreed by kaaaaaaang.
  • 2023-12-29 07:22:51.806774186 +0000 UTC m=+1809662.844001113: ✖️🔁 reset by ti-chi-bot[bot].
  • 2023-12-29 07:23:57.731474982 +0000 UTC m=+1809728.768701913: ☑️ agreed by kaaaaaaang.

@ti-chi-bot ti-chi-bot bot merged commit 90991fb into pingcap:master Dec 29, 2023
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Start multiple TiProxy by TiUP playground with a config file fails
4 participants