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: forward region requests to scheduling server #7023

Merged
merged 8 commits into from
Sep 20, 2023

Conversation

rleungx
Copy link
Member

@rleungx rleungx commented Aug 31, 2023

What problem does this PR solve?

Issue Number: Ref #5839.

What is changed and how does it work?

This PR is used to forward region requests to the scheduling server and let it handle the scheduling directly, the operator will be brought through forwarded heartbeat response to API server. Then send it to TiKV.

Check List

Tests

  • Unit test

Release note

None.

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Aug 31, 2023

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • JmPotato
  • lhy1024

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 Aug 31, 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 do-not-merge/needs-linked-issue 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. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Aug 31, 2023
@ti-chi-bot ti-chi-bot bot requested review from disksing and JmPotato August 31, 2023 09:59
@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 Sep 8, 2023
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Sep 8, 2023

PR needs rebase.

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 kubernetes/test-infra repository.

@rleungx rleungx marked this pull request as ready for review September 14, 2023 06:54
@ti-chi-bot ti-chi-bot bot removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. do-not-merge/needs-linked-issue labels Sep 14, 2023
@rleungx rleungx force-pushed the forward-region branch 2 times, most recently from a46a3e5 to 8adb0d0 Compare September 14, 2023 06:57
@rleungx rleungx requested review from lhy1024 and removed request for disksing September 14, 2023 06:57
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Sep 14, 2023

@rleungx: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

  • /test build
  • /test integration-copr-test

Use /test all to run the following jobs that were automatically triggered:

  • tikv/pd/ghpr_build

In response to this:

/test build

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 kubernetes/test-infra repository.

@rleungx
Copy link
Member Author

rleungx commented Sep 14, 2023

/test build

@rleungx rleungx removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 14, 2023
@codecov
Copy link

codecov bot commented Sep 14, 2023

Codecov Report

Merging #7023 (d11279a) into master (0888ef6) will increase coverage by 0.06%.
Report is 4 commits behind head on master.
The diff coverage is 59.56%.

@@            Coverage Diff             @@
##           master    #7023      +/-   ##
==========================================
+ Coverage   74.33%   74.40%   +0.06%     
==========================================
  Files         437      440       +3     
  Lines       46855    47150     +295     
==========================================
+ Hits        34831    35080     +249     
- Misses       8947     8985      +38     
- Partials     3077     3085       +8     
Flag Coverage Δ
unittests 74.40% <59.56%> (+0.06%) ⬆️

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

Copy link
Contributor

@lhy1024 lhy1024 left a comment

Choose a reason for hiding this comment

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

the rest LGTM

@@ -194,6 +195,54 @@ func RegionFromHeartbeat(heartbeat *pdpb.RegionHeartbeatRequest, opts ...RegionC
return region
}

// RegionFromForward constructs a Region from forwarded region heartbeat.
func RegionFromForward(heartbeat *schedulingpb.RegionHeartbeatRequest, opts ...RegionCreateOption) *RegionInfo {
Copy link
Contributor

Choose a reason for hiding this comment

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

RegionFromForward and RegionFromHeartbeat seem to be different only regionKvSize := heartbeat.GetApproximateKvSize() / units.MiB here.

Copy link
Member Author

Choose a reason for hiding this comment

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

request type is different

}

// processRegionHeartbeat updates the region information.
func (c *Cluster) processRegionHeartbeat(region *core.RegionInfo) error {
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe we can reduce some of the duplicate functions, and of course, we can do it in the next pr.

server/cluster/cluster_test.go Show resolved Hide resolved
@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Sep 19, 2023
Signed-off-by: Ryan Leung <[email protected]>
@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 Sep 20, 2023
@rleungx
Copy link
Member Author

rleungx commented Sep 20, 2023

/merge

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Sep 20, 2023

@rleungx: 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
Contributor

ti-chi-bot bot commented Sep 20, 2023

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

Commit hash: d11279a

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 20, 2023
@ti-chi-bot ti-chi-bot bot merged commit b61a318 into tikv:master Sep 20, 2023
21 of 23 checks passed
@rleungx rleungx deleted the forward-region branch September 20, 2023 05:59
rleungx added a commit to rleungx/pd that referenced this pull request Dec 1, 2023
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