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

checker: skip merge regions that are marked nomerge #4006

Merged
merged 4 commits into from
Aug 19, 2021

Conversation

disksing
Copy link
Contributor

@disksing disksing commented Aug 18, 2021

Signed-off-by: disksing [email protected]

What problem does this PR solve?

Fix #4001

What is changed and how it works?

When regions are marked nomerge, don't merge them.
Also fixed an unstable test.

Check List

Tests

  • Unit test

Release note

Support using region labels to control specific regions from being merged.

@disksing disksing added the component/schedule Scheduling logic. label Aug 18, 2021
@disksing disksing requested review from JmPotato and rleungx August 18, 2021 11:02
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 18, 2021

[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 added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Aug 18, 2021
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 19, 2021
@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Aug 19, 2021
@JmPotato
Copy link
Member

/merge

@ti-chi-bot
Copy link
Member

@JmPotato: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

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
Member

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

Commit hash: bd9147a

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

codecov bot commented Aug 19, 2021

Codecov Report

Merging #4006 (bd9147a) into master (0befeb1) will increase coverage by 0.08%.
The diff coverage is 71.42%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #4006      +/-   ##
==========================================
+ Coverage   74.50%   74.59%   +0.08%     
==========================================
  Files         254      254              
  Lines       25822    25826       +4     
==========================================
+ Hits        19239    19264      +25     
+ Misses       4864     4849      -15     
+ Partials     1719     1713       -6     
Flag Coverage Δ
unittests 74.59% <71.42%> (+0.08%) ⬆️

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

Impacted Files Coverage Δ
server/schedule/checker/merge_checker.go 74.72% <71.42%> (-1.14%) ⬇️
pkg/tempurl/tempurl.go 45.00% <0.00%> (-15.00%) ⬇️
pkg/dashboard/adapter/manager.go 78.72% <0.00%> (-4.26%) ⬇️
client/base_client.go 82.29% <0.00%> (-2.09%) ⬇️
pkg/btree/btree.go 85.78% <0.00%> (-1.69%) ⬇️
server/grpc_service.go 47.00% <0.00%> (-0.12%) ⬇️
client/client.go 71.96% <0.00%> (+0.13%) ⬆️
server/tso/allocator_manager.go 67.77% <0.00%> (+0.16%) ⬆️
pkg/mock/mockcluster/mockcluster.go 95.28% <0.00%> (+0.24%) ⬆️
server/cluster/cluster.go 82.58% <0.00%> (+0.35%) ⬆️
... and 8 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0befeb1...bd9147a. Read the comment docs.

@ti-chi-bot ti-chi-bot merged commit ccc8bcd into tikv:master Aug 19, 2021
@disksing disksing deleted the labeler4 branch August 19, 2021 03:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/schedule Scheduling logic. release-note Denotes a PR that will be considered when it comes time to generate release notes. 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.

Support nomerge label to disable merge for some regions
4 participants