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

mcs: support config http interface in scheduling server #7278

Merged
merged 13 commits into from
Nov 7, 2023

Conversation

lhy1024
Copy link
Contributor

@lhy1024 lhy1024 commented Oct 26, 2023

What problem does this PR solve?

Issue Number: Ref #5839

What is changed and how does it work?

Check List

Tests

  • Unit test

Release note

None.

Signed-off-by: lhy1024 <admin@liudos.us>
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Oct 26, 2023

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • JmPotato
  • 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.

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Oct 26, 2023

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@ti-chi-bot ti-chi-bot bot added release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Oct 26, 2023
@ti-chi-bot ti-chi-bot bot requested review from JmPotato and rleungx October 26, 2023 16:00
@ti-chi-bot ti-chi-bot bot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Oct 26, 2023
server/api/config.go Outdated Show resolved Hide resolved
@ti-chi-bot ti-chi-bot bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Nov 1, 2023
}
cfg.Schedule = configSchedulingServer.Schedule
cfg.Replication = configSchedulingServer.Replication
// TODO: will we support config/store?
Copy link
Contributor Author

Choose a reason for hiding this comment

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

TODO: will we support config/store?

@ti-chi-bot ti-chi-bot bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Nov 1, 2023
func (suite *configTestSuite) TestConfigTTL() {
env := tests.NewSchedulingTestEnvironment(suite.T())
// FIXME: enable this test in two modes after ttl config is supported.
env.RunTestInPDMode(suite.checkConfigTTL)
Copy link
Contributor Author

Choose a reason for hiding this comment

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


func (suite *configTestSuite) TestTTLConflict() {
env := tests.NewSchedulingTestEnvironment(suite.T())
// FIXME: enable this test in two modes after ttl config is supported.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@lhy1024 lhy1024 marked this pull request as ready for review November 1, 2023 13:27
@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 Nov 1, 2023
Copy link

codecov bot commented Nov 1, 2023

Codecov Report

Merging #7278 (b8f59a1) into master (c332ddc) will decrease coverage by 0.05%.
Report is 1 commits behind head on master.
The diff coverage is 62.68%.

❗ Current head b8f59a1 differs from pull request most recent head 860ea5c. Consider uploading reports for the commit 860ea5c to get more accurate results

@@            Coverage Diff             @@
##           master    #7278      +/-   ##
==========================================
- Coverage   74.38%   74.34%   -0.05%     
==========================================
  Files         446      446              
  Lines       48352    48418      +66     
==========================================
+ Hits        35969    35998      +29     
- Misses       9198     9221      +23     
- Partials     3185     3199      +14     
Flag Coverage Δ
unittests 74.34% <62.68%> (-0.05%) ⬇️

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

Signed-off-by: lhy1024 <admin@liudos.us>
Signed-off-by: lhy1024 <admin@liudos.us>
Signed-off-by: lhy1024 <admin@liudos.us>
Comment on lines 134 to 136
router.GET("/schedule", getScheduleConfig)
router.GET("/replicate", getReplicationConfig)
router.GET("/store", getStoreConfig)
Copy link
Member

Choose a reason for hiding this comment

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

I was wondering if we need these APIs, I think they are barely used.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Because api server has the same interface. Maybe we also call "/config" in api server for these interfaces?

Copy link
Member

Choose a reason for hiding this comment

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

I think it's better, WDYT?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think we can cancel "/config/schedule" and "/config/replicate", which are in "/config". But we should keep "config/store", otherwise we have no way to get store config, which is not in "/config".

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Or we can put store config into "/config" and add a new struct for it. How about it?

type ConfigPayload{
   Schedule
   Replication
   StoreConfig
   ...
}

Copy link
Member

Choose a reason for hiding this comment

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

OK, make sense to me.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Or only remove "/config/store", I found there is no "/config/store" in api server

Signed-off-by: lhy1024 <admin@liudos.us>
Signed-off-by: lhy1024 <admin@liudos.us>
Signed-off-by: lhy1024 <admin@liudos.us>
@lhy1024 lhy1024 requested a review from rleungx November 2, 2023 07:09
Signed-off-by: lhy1024 <admin@liudos.us>
Signed-off-by: lhy1024 <admin@liudos.us>
@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 3, 2023
@ti-chi-bot ti-chi-bot bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Nov 3, 2023
@lhy1024
Copy link
Contributor Author

lhy1024 commented Nov 7, 2023

/merge

Copy link
Contributor

ti-chi-bot bot commented Nov 7, 2023

@lhy1024: 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.

Copy link
Contributor

ti-chi-bot bot commented Nov 7, 2023

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

Commit hash: adc7879

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 7, 2023
ti-chi-bot bot and others added 2 commits November 7, 2023 02:59
Signed-off-by: lhy1024 <admin@liudos.us>
@ti-chi-bot ti-chi-bot bot removed the status/can-merge Indicates a PR has been approved by a committer. label Nov 7, 2023
@lhy1024
Copy link
Contributor Author

lhy1024 commented Nov 7, 2023

/merge

Copy link
Contributor

ti-chi-bot bot commented Nov 7, 2023

@lhy1024: 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.

Copy link
Contributor

ti-chi-bot bot commented Nov 7, 2023

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

Commit hash: b8f59a1

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 7, 2023
@ti-chi-bot ti-chi-bot bot merged commit 47ba96f into tikv:master Nov 7, 2023
22 checks passed
rleungx pushed a commit to rleungx/pd that referenced this pull request Dec 1, 2023
ref tikv#5839

Signed-off-by: lhy1024 <admin@liudos.us>

Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants