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 region http interface in scheduling server #7297

Merged
merged 18 commits into from
Nov 23, 2023

Conversation

lhy1024
Copy link
Contributor

@lhy1024 lhy1024 commented Nov 1, 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.

Copy link
Contributor

ti-chi-bot bot commented Nov 1, 2023

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • CabinfeverB
  • 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 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 Nov 1, 2023
Copy link
Contributor

ti-chi-bot bot commented Nov 1, 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 the release-note-none Denotes a PR that doesn't merit a release note. label Nov 1, 2023
@ti-chi-bot ti-chi-bot bot requested review from disksing and nolouch November 1, 2023 13:56
@ti-chi-bot ti-chi-bot bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Nov 1, 2023

// RegisterRegionLabelRouter registers the router of the region label handler.
func (s *Service) RegisterRegionLabelRouter() {
router := s.root.Group("config/region-label")
Copy link
Member

Choose a reason for hiding this comment

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

Shall we add a sub group 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.

yes, I will do it. The code is written before config pr merged.

@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 Nov 17, 2023
@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 Nov 20, 2023
Signed-off-by: lhy1024 <[email protected]>
@rleungx
Copy link
Member

rleungx commented Nov 21, 2023

Is it ready to review?

@lhy1024
Copy link
Contributor Author

lhy1024 commented Nov 21, 2023

Is it ready to review?

I am moving test, it will be ready to review today.

conf.Replication.EnablePlacementRules = true
})
// FIXME: enable this test in two modes.
env.RunTestInPDMode(suite.checkRegionsReplicated)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This seem to be a new bug. BTW, we need to fix below test.
image

Copy link
Contributor Author

Choose a reason for hiding this comment

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

it always try to add rule peer, maybe there is a problem in placement rule sync

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 will do it in another pr #7418

@lhy1024 lhy1024 marked this pull request as ready for review November 21, 2023 10:56
@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 21, 2023
Signed-off-by: lhy1024 <[email protected]>
if rule.filter != nil && !rule.filter(r) {
continue
}
origin := r.URL.Path
// we check the service primary addr here, so no need to check independently again.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Is it right? cc @rleungx

Copy link
Member

Choose a reason for hiding this comment

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

Yes, because the check service is used to manage service dynamically and tso is not supported now.

Copy link

codecov bot commented Nov 22, 2023

Codecov Report

Merging #7297 (b777d28) into master (9902be8) will decrease coverage by 0.18%.
The diff coverage is 58.45%.

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

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #7297      +/-   ##
==========================================
- Coverage   74.32%   74.15%   -0.18%     
==========================================
  Files         451      451              
  Lines       49387    49526     +139     
==========================================
+ Hits        36709    36726      +17     
- Misses       9417     9497      +80     
- Partials     3261     3303      +42     
Flag Coverage Δ
unittests 74.15% <58.45%> (-0.18%) ⬇️

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

@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 23, 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 23, 2023
@lhy1024
Copy link
Contributor Author

lhy1024 commented Nov 23, 2023

/merge

Copy link
Contributor

ti-chi-bot bot commented Nov 23, 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 23, 2023

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

Commit hash: 8a6f56d

@ti-chi-bot ti-chi-bot bot added status/can-merge Indicates a PR has been approved by a committer. and removed status/can-merge Indicates a PR has been approved by a committer. labels Nov 23, 2023
Signed-off-by: lhy1024 <[email protected]>
@lhy1024
Copy link
Contributor Author

lhy1024 commented Nov 23, 2023

/merge

Copy link
Contributor

ti-chi-bot bot commented Nov 23, 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 23, 2023

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

Commit hash: b777d28

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 23, 2023
Copy link
Contributor

ti-chi-bot bot commented Nov 23, 2023

@lhy1024: Your PR was out of date, I have automatically updated it for you.

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.

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 ti-chi-bot bot merged commit c1e4a2a into tikv:master Nov 23, 2023
22 checks passed
@lhy1024 lhy1024 deleted the sche-redirect11 branch November 24, 2023 02:39
rleungx pushed a commit to rleungx/pd that referenced this pull request Dec 1, 2023
ref tikv#5839

Signed-off-by: lhy1024 <[email protected]>

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