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

checker: fix the conflict between tiflash learner and location labels #6660

Merged
merged 1 commit into from
Jun 25, 2023
Merged

checker: fix the conflict between tiflash learner and location labels #6660

merged 1 commit into from
Jun 25, 2023

Conversation

rleungx
Copy link
Member

@rleungx rleungx commented Jun 24, 2023 •
edited
Loading

What problem does this PR solve?

Issue Number: Close #6662.

What is changed and how does it work?

This PR only chooses the source store that is contained in the rule.

Check List

Tests

  • Unit test

Release note

None.

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Jun 24, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • JmPotato
  • nolouch

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 do-not-merge/needs-linked-issue release-note-none Denotes a PR that doesn't merit a release note. labels Jun 24, 2023
@ti-chi-bot ti-chi-bot bot requested review from HunDunDM and JmPotato June 24, 2023 04:19
@ti-chi-bot ti-chi-bot bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jun 24, 2023
@rleungx
fix the conflict between tiflash learner and location labels
4f255fa 
Signed-off-by: Ryan Leung <rleungx@gmail.com>
@codecov
Copy link

codecov bot commented Jun 24, 2023 •
edited
Loading

Codecov Report

Patch coverage: 100.00% and project coverage change: -0.15 ⚠️

Comparison is base (ac31f87) 74.77% compared to head (4f255fa) 74.63%.

Additional details and impacted files 
@@            Coverage Diff             @@
##           master    #6660      +/-   ##
==========================================
- Coverage   74.77%   74.63%   -0.15%     
==========================================
  Files         417      417              
  Lines       43089    43090       +1     
==========================================
- Hits        32219    32159      -60     
- Misses       8039     8086      +47     
- Partials     2831     2845      +14
Flag Coverage Δ
unittests 74.63% <100.00%> (-0.15%) ⬇️

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

Impacted Files Coverage Δ
pkg/schedule/checker/rule_checker.go 83.68% <100.00%> (+0.05%) ⬆️

... and 25 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@JmPotato JmPotato requested review from nolouch and removed request for HunDunDM June 24, 2023 05:16
@ti-chi-bot ti-chi-bot bot added needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. and removed do-not-merge/needs-linked-issue labels Jun 24, 2023
@JmPotato JmPotato removed needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. labels Jun 25, 2023
@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jun 25, 2023
nolouch
nolouch approved these changes Jun 25, 2023
View reviewed changes
Copy link
Contributor

@nolouch nolouch left a comment

Choose a reason for hiding this comment

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

lgtm

@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 Jun 25, 2023
@JmPotato
Copy link
Member

/merge

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Jun 25, 2023

@JmPotato: 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 Jun 25, 2023

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

Commit hash: 4f255fa

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 25, 2023
@ti-chi-bot ti-chi-bot bot merged commit f4d774a into tikv:master Jun 25, 2023
@rleungx rleungx deleted the tiflash-location branch June 25, 2023 07:30
@JmPotato JmPotato mentioned this pull request Jun 25, 2023
Merged
@nolouch nolouch mentioned this pull request Jul 5, 2023
Open
rleungx added a commit to rleungx/pd that referenced this pull request Jul 10, 2023
@rleungx
checker: fix the conflict between tiflash learner and location labels (…
1f0f401 
…tikv#6660)

close tikv#6662

Signed-off-by: Ryan Leung <rleungx@gmail.com>
ti-chi-bot bot pushed a commit that referenced this pull request Jul 10, 2023
@rleungx
checker: fix the conflict between tiflash learner and location labels (…
ffe7b9b 
…#6660) (#6778)

close #6662

Signed-off-by: Ryan Leung <rleungx@gmail.com>
@HuSharp HuSharp mentioned this pull request Aug 3, 2023
Merged
16 tasks
@rleungx rleungx added needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. and removed needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. labels Aug 14, 2023
@ti-chi-bot
Copy link
Member

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

@ti-chi-bot ti-chi-bot mentioned this pull request Aug 14, 2023
Merged
ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Aug 14, 2023
@rleungx @ti-chi-bot
This is an automated cherry-pick of tikv#6660
85765d0 
close tikv#6662

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
rleungx added a commit to rleungx/pd that referenced this pull request Dec 4, 2023
@rleungx
checker: fix the conflict between tiflash learner and location labels (…
6ef2dbd 
…tikv#6660)

close tikv#6662

Signed-off-by: Ryan Leung <rleungx@gmail.com>
ti-chi-bot bot added a commit that referenced this pull request Dec 19, 2023
@ti-chi-bot @rleungx @ti-chi-bot
schedule: fix location label in placement rule not work well with rul…
b0b1e38 
…e checker (#6660) (#6956)

close #6637

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
Signed-off-by: Ryan Leung <rleungx@gmail.com>

Co-authored-by: Ryan Leung <rleungx@gmail.com>
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

@nolouch nolouch nolouch 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/M Denotes a PR that changes 30-99 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.

rule-checker does not consider the engine label constraint
4 participants
@rleungx @JmPotato @ti-chi-bot @nolouch