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

pkg/schedule: put merge operators together #8050

Merged
merged 2 commits into from
Apr 11, 2024
Merged

pkg/schedule: put merge operators together #8050

merged 2 commits into from
Apr 11, 2024

Conversation

nolouch
Copy link
Contributor

@nolouch nolouch commented Apr 10, 2024 •
edited by rleungx
Loading

What problem does this PR solve?

Issue Number: Ref #7897, close #8049.

What is changed and how does it work?

pkg/schedule: put merge operators together to maintain atomicity

Check List

Tests

  • Unit test

Release note

None.

@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Apr 10, 2024 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • lhy1024
  • 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 release-note-none Denotes a PR that doesn't merit a release note. label Apr 10, 2024
@ti-chi-bot ti-chi-bot bot requested review from disksing and rleungx April 10, 2024 08:33
@ti-chi-bot ti-chi-bot bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Apr 10, 2024
rleungx
rleungx reviewed Apr 10, 2024
View reviewed changes
pkg/schedule/operator/waiting_operator.go
@@ -26,6 +26,7 @@ var priorityWeight = []float64{1.0, 4.0, 9.0, 16.0}
// WaitingOperator is an interface of waiting operators.
type WaitingOperator interface {
PutOperator(op *Operator)
PutMergeOperators(op []*Operator)
Copy link
Member

Choose a reason for hiding this comment

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

How about:

Suggested change
PutMergeOperators(op []*Operator)
PutOperators(op []*Operator)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Now it is only used for merge, and the common name is easy to misunderstand.

@codecov Codecov
Copy link

codecov bot commented Apr 10, 2024 •
edited
Loading

Codecov Report

Merging #8050 (b1275b1) into master (f0eb74b) will decrease coverage by 0.01%.
The diff coverage is 84.61%.

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

Additional details and impacted files 
@@            Coverage Diff             @@
##           master    #8050      +/-   ##
==========================================
- Coverage   77.24%   77.23%   -0.01%     
==========================================
  Files         468      468              
  Lines       60879    60890      +11     
==========================================
+ Hits        47024    47029       +5     
- Misses      10304    10313       +9     
+ Partials     3551     3548       -3
Flag Coverage Δ
unittests 77.23% <84.61%> (-0.01%) ⬇️

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

@nolouch nolouch requested review from lhy1024 and removed request for disksing April 10, 2024 09:02
@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 10, 2024
@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 Apr 11, 2024
@nolouch
Copy link
Contributor Author

nolouch commented Apr 11, 2024

/merge

@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Apr 11, 2024

@nolouch: 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 ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Apr 11, 2024

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

Commit hash: b1275b1

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

ti-chi-bot bot commented Apr 11, 2024

@nolouch: 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 96a69fc into tikv:master Apr 11, 2024
22 checks passed
@rleungx rleungx added the needs-cherry-pick-release-8.1 Should cherry pick this PR to release-8.1 branch. label Apr 15, 2024
@ti-chi-bot ti-chi-bot mentioned this pull request Apr 15, 2024
Merged
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-8.1: #8063.

ti-chi-bot bot pushed a commit that referenced this pull request Apr 15, 2024
@ti-chi-bot @nolouch
pkg/schedule: put merge operators together (#8050) (#8063)
3ec92bd 
ref #7897, close #8049

pkg/schedule: put merge operators together to maintain atomicity

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

Co-authored-by: nolouch <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lhy1024 lhy1024 lhy1024 approved these changes

@rleungx rleungx rleungx approved these changes

Assignees
No one assigned
Labels
needs-cherry-pick-release-8.1 Should cherry pick this PR to release-8.1 branch. release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 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.

pd panic after fault recover from time offset 5mins
4 participants
@nolouch @ti-chi-bot @lhy1024 @rleungx