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

*: decouple operator handler and server #7089

Merged
merged 5 commits into from
Sep 19, 2023
Merged

*: decouple operator handler and server #7089

merged 5 commits into from
Sep 19, 2023

Conversation

lhy1024
Copy link
Contributor

@lhy1024 lhy1024 commented Sep 13, 2023 •
edited
Loading

What problem does this PR solve?

Issue Number: Ref #5839

What is changed and how does it work?

  1. move operator handler from server to pkg/operator/handler
  2. move error from server to pkg/errs
  3. add a interface for pd server and scheduling server

Check List

Tests

  • Unit test

Release note

None.

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Sep 13, 2023 •
edited
Loading

[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 ti-chi-bot bot added 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. labels Sep 13, 2023
@codecov
Copy link

codecov bot commented Sep 13, 2023 •
edited
Loading

Codecov Report

Merging #7089 (70d71c6) into master (0888ef6) will increase coverage by 0.04%.
Report is 2 commits behind head on master.
The diff coverage is 47.30%.

❗ Current head 70d71c6 differs from pull request most recent head 6c29bd0. Consider uploading reports for the commit 6c29bd0 to get more accurate results

@@            Coverage Diff             @@
##           master    #7089      +/-   ##
==========================================
+ Coverage   74.33%   74.37%   +0.04%     
==========================================
  Files         437      439       +2     
  Lines       46855    46938      +83     
==========================================
+ Hits        34831    34912      +81     
- Misses       8947     8952       +5     
+ Partials     3077     3074       -3
Flag Coverage Δ
unittests 74.37% <47.30%> (+0.04%) ⬆️

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

@lhy1024 lhy1024 requested review from JmPotato and removed request for disksing September 14, 2023 03:25
rleungx
rleungx reviewed Sep 15, 2023
View reviewed changes
go.mod Outdated Show resolved Hide resolved
@lhy1024
address comments
acc5bab 
Signed-off-by: lhy1024 <[email protected]>
@rleungx rleungx mentioned this pull request Sep 15, 2023
Closed
rleungx
rleungx reviewed Sep 18, 2023
View reviewed changes
pkg/errs/error.go Outdated Show resolved Hide resolved
rleungx
rleungx reviewed Sep 18, 2023
View reviewed changes
server/handler.go
Comment on lines +51 to +61
type server struct {
*Server
}

func (s *server) GetCoordinator() *schedule.Coordinator {
return s.GetRaftCluster().GetCoordinator()
}

func (s *server) GetCluster() sche.SharedCluster {
return s.GetRaftCluster()
}
Copy link
Member

Choose a reason for hiding this comment

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

Why do we need it?

Copy link
Contributor Author

@lhy1024 lhy1024 Sep 18, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

we can put common code in server/handler.go, which avoid redundant code in scheduling server and pd server

@lhy1024
normalized error
3280adb 
Signed-off-by: lhy1024 <[email protected]>
@lhy1024
add TODO
70d71c6 
Signed-off-by: lhy1024 <[email protected]>
@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Sep 19, 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 Sep 19, 2023
@lhy1024
Copy link
Contributor Author

lhy1024 commented Sep 19, 2023

/merge

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Sep 19, 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.

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Sep 19, 2023

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

Commit hash: 70d71c6

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

ti-chi-bot bot commented Sep 19, 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 dff99fd into tikv:master Sep 19, 2023
19 checks passed
@lhy1024 lhy1024 mentioned this pull request Oct 9, 2023
Closed
25 tasks
rleungx pushed a commit to rleungx/pd that referenced this pull request Dec 1, 2023
@lhy1024 @ti-chi-bot @rleungx
*: decouple operator handler and server (tikv#7089)
131be48 
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
Reviewers

@rleungx rleungx rleungx approved these changes

@JmPotato JmPotato JmPotato approved these changes

Assignees
No one assigned
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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@lhy1024 @JmPotato @rleungx