schedule: fix location label in placement rule not work well with rule checker by rleungx · Pull Request #6633 · tikv/pd

rleungx · 2023-06-19T10:44:19Z

What problem does this PR solve?

Issue Number: Close #6637

What is changed and how does it work?

This PR is going to use the region store as the source instead of rule stores.

Check List

Tests

Unit test

Release note

None.

ti-chi-bot · 2023-06-19T10:44:21Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

CabinfeverB
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.

Details

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

nolouch · 2023-06-19T10:50:44Z

pkg/schedule/checker/rule_checker.go

 	if oldStore == 0 {
 		return nil, nil
 	}
+	ruleStores := c.getRuleFitStores(rf)


I think here the rule store is a sub-set of theregion stores? maybe directly get all stores which match the rule constraint.

codecov · 2023-06-19T10:59:49Z

Codecov Report

Patch coverage: 63.63% and project coverage change: -0.08 ⚠️

Comparison is base (4bb5c23) 74.61% compared to head (050a1c5) 74.53%.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #6633      +/-   ##
==========================================
- Coverage   74.61%   74.53%   -0.08%     
==========================================
  Files         417      417              
  Lines       43060    43067       +7     
==========================================
- Hits        32129    32101      -28     
- Misses       8087     8112      +25     
- Partials     2844     2854      +10

Flag	Coverage Δ
unittests	`74.53% <63.63%> (-0.08%)`	⬇️

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

Impacted Files	Coverage Δ
pkg/schedule/checker/replica_strategy.go	`79.62% <0.00%> (-6.38%)`	⬇️
pkg/schedule/checker/rule_checker.go	`83.62% <100.00%> (+0.17%)`	⬆️

... and 29 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.

nolouch

rest lgtm

pkg/schedule/checker/rule_checker.go

CabinfeverB · 2023-06-20T04:10:07Z

/check-issue-triage-complete

pkg/schedule/checker/rule_checker.go

nolouch

lgtm

bufferflies · 2023-06-20T06:32:06Z

pkg/schedule/checker/rule_checker.go

+		}
+	}
+
+	newStore, filterByTempState := strategy.SelectStoreToImprove(coLocationStores, oldStore)


what's happen if coLocationStores is nil.

add a check in both SelectStoreToImprove and SelectStoreToFix

Signed-off-by: Ryan Leung <rleungx@gmail.com>

rleungx · 2023-06-20T08:03:56Z

/merge

ti-chi-bot · 2023-06-20T08:03:57Z

@rleungx: 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.

Details

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 · 2023-06-20T08:03:59Z

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

Details

Commit hash: 36b0138

rleungx · 2023-06-20T08:30:01Z

/test build

ti-chi-bot · 2023-06-20T08:37:50Z

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

close tikv#6637 Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

ti-chi-bot · 2023-06-20T08:38:28Z

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

ti-chi-bot · 2023-06-20T08:39:06Z

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

…e checker (tikv#6633) close tikv#6637 Signed-off-by: Ryan Leung <rleungx@gmail.com>

#6648) * schedule: fix location label in placement rule not work well with rule checker (#6633) close #6637 Signed-off-by: Ryan Leung <rleungx@gmail.com>

…e checker (tikv#6633) close tikv#6637 Signed-off-by: Ryan Leung <rleungx@gmail.com>

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 19, 2023

ti-chi-bot bot requested review from HunDunDM and lhy1024 June 19, 2023 10:44

ti-chi-bot bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jun 19, 2023

nolouch reviewed Jun 19, 2023

View reviewed changes

ti-chi-bot bot added do-not-merge/needs-triage-completed needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. and removed do-not-merge/needs-linked-issue do-not-merge/needs-triage-completed labels Jun 20, 2023

rleungx requested review from CabinfeverB and bufferflies June 20, 2023 03:33

nolouch reviewed Jun 20, 2023

View reviewed changes

pkg/schedule/checker/rule_checker.go Outdated Show resolved Hide resolved

ti-chi-bot bot added the do-not-merge/needs-triage-completed label Jun 20, 2023

ti-chi-bot bot removed the do-not-merge/needs-triage-completed label Jun 20, 2023

CabinfeverB reviewed Jun 20, 2023

View reviewed changes

pkg/schedule/checker/rule_checker.go Outdated Show resolved Hide resolved

rleungx requested review from CabinfeverB and nolouch June 20, 2023 05:10

CabinfeverB approved these changes Jun 20, 2023

View reviewed changes

ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jun 20, 2023

nolouch approved these changes Jun 20, 2023

View reviewed changes

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 20, 2023

bufferflies reviewed Jun 20, 2023

View reviewed changes

rleungx added 3 commits June 20, 2023 15:08

fix location label in placement rule not work well with rule checker

d848cef

Signed-off-by: Ryan Leung <rleungx@gmail.com>

address the comment

b4d5644

Signed-off-by: Ryan Leung <rleungx@gmail.com>

address the comment

c351d94

Signed-off-by: Ryan Leung <rleungx@gmail.com>

rleungx added 2 commits June 20, 2023 15:08

address the comment

b878f6a

Signed-off-by: Ryan Leung <rleungx@gmail.com>

address the comment

d0d9341

Signed-off-by: Ryan Leung <rleungx@gmail.com>

rleungx force-pushed the location-label branch from cba863d to d0d9341 Compare June 20, 2023 07:08

address the comment

36b0138

Signed-off-by: Ryan Leung <rleungx@gmail.com>

ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 20, 2023

Merge branch 'master' into location-label

050a1c5

rleungx added needs-cherry-pick-release-7.2 needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. labels Jun 20, 2023

ti-chi-bot bot merged commit 77083e6 into tikv:master Jun 20, 2023

rleungx deleted the location-label branch June 20, 2023 08:37

ti-chi-bot mentioned this pull request Jun 20, 2023

schedule: fix location label in placement rule not work well with rule checker (#6633) #6641

Closed

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Jun 20, 2023

This is an automated cherry-pick of tikv#6633

6970cf0

close tikv#6637 Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

ti-chi-bot mentioned this pull request Jun 20, 2023

schedule: fix location label in placement rule not work well with rule checker (#6633) #6642

Closed

ti-chi-bot mentioned this pull request Jun 20, 2023

schedule: fix location label in placement rule not work well with rule checker (#6633) #6643

Closed

rleungx added a commit to rleungx/pd that referenced this pull request Jun 20, 2023

schedule: fix location label in placement rule not work well with rul…

674a34d

…e checker (tikv#6633) close tikv#6637 Signed-off-by: Ryan Leung <rleungx@gmail.com>

rleungx added a commit to rleungx/pd that referenced this pull request Jun 20, 2023

schedule: fix location label in placement rule not work well with rul…

5773fd3

…e checker (tikv#6633) close tikv#6637 Signed-off-by: Ryan Leung <rleungx@gmail.com>

rleungx mentioned this pull request Jun 20, 2023

schedule: fix location label in placement rule not work well with rul… #6648

Merged

rleungx added a commit to rleungx/pd that referenced this pull request Jun 21, 2023

schedule: fix location label in placement rule not work well with rul…

40e0e1f

…e checker (tikv#6633) close tikv#6637 Signed-off-by: Ryan Leung <rleungx@gmail.com>

JmPotato mentioned this pull request Jun 24, 2023

rule-checker does not consider the engine label constraint #6662

Closed

rleungx added a commit to rleungx/pd that referenced this pull request Dec 4, 2023

schedule: fix location label in placement rule not work well with rul…

ab9917b

…e checker (tikv#6633) close tikv#6637 Signed-off-by: Ryan Leung <rleungx@gmail.com>

Conversation

rleungx commented Jun 19, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What problem does this PR solve?

What is changed and how does it work?

Check List

Release note

Uh oh!

ti-chi-bot bot commented Jun 19, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

nolouch Jun 19, 2023

Choose a reason for hiding this comment

Uh oh!

codecov bot commented Jun 19, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

nolouch left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

CabinfeverB commented Jun 20, 2023

Uh oh!

Uh oh!

nolouch left a comment

Choose a reason for hiding this comment

Uh oh!

bufferflies Jun 20, 2023

Choose a reason for hiding this comment

Uh oh!

rleungx Jun 20, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rleungx commented Jun 20, 2023

Uh oh!

ti-chi-bot bot commented Jun 20, 2023

Uh oh!

ti-chi-bot bot commented Jun 20, 2023

Uh oh!

rleungx commented Jun 20, 2023

Uh oh!

ti-chi-bot commented Jun 20, 2023

Uh oh!

ti-chi-bot commented Jun 20, 2023

Uh oh!

ti-chi-bot commented Jun 20, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

rleungx commented Jun 19, 2023 •

edited

Loading

ti-chi-bot bot commented Jun 19, 2023 •

edited

Loading

codecov bot commented Jun 19, 2023 •

edited

Loading

rleungx Jun 20, 2023 •

edited

Loading