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

schedulers: add sanity check for random-merge (#2212) #2221

Merged
merged 2 commits into from
Mar 10, 2020

Conversation

disksing
Copy link
Contributor

Signed-off-by: disksing i@disksing.com

What problem does this PR solve?

cherry-pick #2212 to resolve #2210

What is changed and how it works?

  • port merge checks from mergeChecker to random-merge-scheduler
  • minor refactor: remove mergeChecker.ruleManager and get it from cluster

Check List

Tests

  • Unit test

Signed-off-by: disksing <i@disksing.com>
@disksing disksing added this to the v3.1.0-rc milestone Mar 10, 2020
@disksing
Copy link
Contributor Author

/merge

@sre-bot sre-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 10, 2020
@sre-bot
Copy link
Contributor

sre-bot commented Mar 10, 2020

/run-all-tests

@sre-bot
Copy link
Contributor

sre-bot commented Mar 10, 2020

@disksing merge failed.

@disksing
Copy link
Contributor Author

/merge

@sre-bot
Copy link
Contributor

sre-bot commented Mar 10, 2020

Your auto merge job has been accepted, waiting for 2222

@sre-bot
Copy link
Contributor

sre-bot commented Mar 10, 2020

/run-all-tests

@sre-bot
Copy link
Contributor

sre-bot commented Mar 10, 2020

@disksing merge failed.

@disksing
Copy link
Contributor Author

/merge

@sre-bot
Copy link
Contributor

sre-bot commented Mar 10, 2020

Your auto merge job has been accepted, waiting for 2222

@sre-bot
Copy link
Contributor

sre-bot commented Mar 10, 2020

/run-all-tests

@sre-bot sre-bot merged commit a7b6d4f into tikv:release-3.1 Mar 10, 2020
@disksing disksing deleted the cp2212 branch March 10, 2020 13:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/schedule Scheduling logic. status/can-merge Indicates a PR has been approved by a committer.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants