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

schedule: fix merge related operators in waiting operators #1633

Merged
merged 2 commits into from Jul 11, 2019

Conversation

rleungx
Copy link
Member

@rleungx rleungx commented Jul 11, 2019

What problem does this PR solve?

Currently, we only take merge-region into consideration. But random-merge and admin-merge-region also need to be considered.

What is changed and how it works?

This PR uses Kind() instead of Desc() to decide if we need to get another operator.

Check List

Tests

  • Unit test

Signed-off-by: Ryan Leung <rleungx@gmail.com>
@rleungx rleungx added the component/schedule Scheduling logic. label Jul 11, 2019
@rleungx rleungx changed the title schedule: fix random merge in waiting operators schedule: fix merge related operators in waiting operators Jul 11, 2019
Signed-off-by: Ryan Leung <rleungx@gmail.com>
Copy link
Member

@Connor1996 Connor1996 left a comment

Choose a reason for hiding this comment

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

LGTM

@rleungx rleungx added the needs-cherry-pick-release-3.0 The PR needs to cherry pick to release-3.0 branch. label Jul 11, 2019
@Connor1996 Connor1996 merged commit 6ee7fda into tikv:master Jul 11, 2019
rleungx added a commit to rleungx/pd that referenced this pull request Jul 12, 2019
* fix random merge in waiting operators

Signed-off-by: Ryan Leung <rleungx@gmail.com>
rleungx added a commit that referenced this pull request Jul 15, 2019
Signed-off-by: Ryan Leung <rleungx@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/schedule Scheduling logic. needs-cherry-pick-release-3.0 The PR needs to cherry pick to release-3.0 branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants