rule_checker: fix the issue of not being able to achieve the better RegionFit #7219

nolouch · 2023-10-17T13:06:40Z

What problem does this PR solve?

Issue Number: Close #7185

What is changed and how does it work?

fix the issue of not being able to achieve the better RegionFit
- try to replace the existing peer in another rulefit

Check List

Tests

Unit test
Integration test

Release note

None.

ti-chi-bot · 2023-10-17T13:06:43Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

CabinfeverB
bufferflies

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.

codecov · 2023-10-17T13:25:42Z

Codecov Report

Merging #7219 (859d708) into master (1899f41) will increase coverage by 0.02%.
The diff coverage is 83.33%.

❗ Current head 859d708 differs from pull request most recent head 583a4fc. Consider uploading reports for the commit 583a4fc to get more accurate results

@@            Coverage Diff             @@
##           master    #7219      +/-   ##
==========================================
+ Coverage   74.35%   74.37%   +0.02%     
==========================================
  Files         446      442       -4     
  Lines       48159    47908     -251     
==========================================
- Hits        35810    35633     -177     
+ Misses       9191     9107      -84     
- Partials     3158     3168      +10

Flag	Coverage Δ
unittests	`74.37% <83.33%> (+0.02%)`	⬆️

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

… fit Signed-off-by: nolouch <[email protected]>

nolouch · 2023-10-20T07:48:45Z

ptal @CabinfeverB @rleungx

CabinfeverB · 2023-10-21T07:52:12Z

pkg/schedule/checker/rule_checker_test.go

+		rules  []string
+		opStr  string
+	}{
+		{"111_leader,211,311", []string{"3/voter//", "3/learner/type=read/"}, "replace-rule-swap-fit-peer {mv peer: store [111] to"},


mv peer: store [111] to pls add target into op desc?

And IMO, no need to remove the old peer, just add voter and demote old peer.

mv peer: store [111] to pls add target into op desc?

The target is random here.

CabinfeverB · 2023-10-21T08:08:20Z

pkg/schedule/checker/rule_checker.go

+					continue
+				}
+				ruleCheckerNoStoreThenTryReplace.Inc()
+				op, err := c.replaceUnexpectRulePeer(region, oldPeerRuleFit, fit, p, "swap-fit")


ref https://github.com/tikv/pd/pull/7219/files#r1367687550, maybe another op?

I want to reuse the old function and make it right first, it needs to be picked to 7.5. maybe improve it after this pr.

BTW, I think in most situations, there should be enough stores to add learners.

bufferflies · 2023-10-23T06:28:58Z

pkg/schedule/checker/rule_checker_test.go

+
+// example: "3/voter/zone=zone1+zone2,rack=rack2/zone,rack,host"
+// count role constraints location_labels
+func makeRule(def string) *placement.Rule {


how about use this method

pd/pkg/schedule/placement/fit_test.go

Line 80 in 4b7e792

func makeRule(def string) *Rule {

yes, it's a copy of that because not in the same package, do not let the test have dependence first. maybe extract to unit package later.

bufferflies · 2023-10-23T06:30:38Z

pkg/schedule/checker/rule_checker_test.go

+}
+
+// example: "1111_leader,1234,2111_learner"
+func makeRegion(def string) *core.RegionInfo {


ditto 'https://github.com/HunDunDM/pd/blob/4b7e79209c11f35e1e326c1864b944c1c18d941e/pkg/schedule/placement/fit_test.go#L58-L76'

bufferflies

rest LGTM

nolouch · 2023-10-23T08:17:11Z

/merge

ti-chi-bot · 2023-10-23T08:17:13Z

@nolouch: 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 · 2023-10-23T08:17:14Z

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

Commit hash: 859d708

ti-chi-bot · 2023-10-23T08:17:28Z

@nolouch: Your PR was out of date, I have automatically updated it for you.

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.

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-10-23T08:29:39Z

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

ti-chi-bot · 2023-10-23T08:30:17Z

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

…egionFit (#7219) (#7245) close #7185 fix the issue of not being able to achieve the better RegionFit - try to replace the existing peer in another rulefit Signed-off-by: nolouch <[email protected]> Co-authored-by: nolouch <[email protected]> Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>

…egionFit (#7219) (#7244) close #7185 fix the issue of not being able to achieve the better RegionFit - try to replace the existing peer in another rulefit Signed-off-by: nolouch <[email protected]> Co-authored-by: nolouch <[email protected]> Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>

ti-chi-bot bot added release-note-none Denotes a PR that doesn't merit a release note. needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. labels Oct 17, 2023

ti-chi-bot bot requested review from disksing and Yisaer October 17, 2023 13:06

ti-chi-bot bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Oct 17, 2023

nolouch requested review from lhy1024, CabinfeverB and rleungx and removed request for disksing and Yisaer October 17, 2023 13:08

nolouch force-pushed the fix-placement-rule branch from 0700d50 to e6664b8 Compare October 17, 2023 13:10

nolouch changed the title ~~placement: fix the issue of not being able to achieve the best RegionFit~~ rule_checker: fix the issue of not being able to achieve the best RegionFit Oct 17, 2023

nolouch added 2 commits October 18, 2023 11:43

placement: fix the issue of not being able to achieve the best region…

4b7e792

… fit Signed-off-by: nolouch <[email protected]>

Merge remote-tracking branch 'origin/master' into fix-placement-rule

859d708

nolouch force-pushed the fix-placement-rule branch from a51fb5e to 859d708 Compare October 18, 2023 03:44

nolouch changed the title ~~rule_checker: fix the issue of not being able to achieve the best RegionFit~~ rule_checker: fix the issue of not being able to achieve the better RegionFit Oct 18, 2023

ti-chi-bot bot added the needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. label Oct 18, 2023

CabinfeverB reviewed Oct 21, 2023

View reviewed changes

CabinfeverB approved these changes Oct 23, 2023

View reviewed changes

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

bufferflies reviewed Oct 23, 2023

View reviewed changes

bufferflies approved these changes Oct 23, 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 Oct 23, 2023

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

Merge branch 'master' into fix-placement-rule

583a4fc

ti-chi-bot bot merged commit 3f1a688 into tikv:master Oct 23, 2023
19 checks passed

This was referenced Oct 23, 2023

rule_checker: fix the issue of not being able to achieve the better RegionFit (#7219) #7244

Merged

rule_checker: fix the issue of not being able to achieve the better RegionFit (#7219) #7245

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

rule_checker: fix the issue of not being able to achieve the better RegionFit #7219

rule_checker: fix the issue of not being able to achieve the better RegionFit #7219

nolouch commented Oct 17, 2023 •

edited

Loading

ti-chi-bot bot commented Oct 17, 2023 •

edited

Loading

codecov bot commented Oct 17, 2023 •

edited

Loading

nolouch commented Oct 20, 2023

CabinfeverB Oct 21, 2023

CabinfeverB Oct 21, 2023

nolouch Oct 23, 2023

CabinfeverB Oct 21, 2023

nolouch Oct 23, 2023 •

edited

Loading

bufferflies Oct 23, 2023 •

edited

Loading

nolouch Oct 23, 2023

bufferflies Oct 23, 2023

bufferflies left a comment

nolouch commented Oct 23, 2023

ti-chi-bot bot commented Oct 23, 2023

ti-chi-bot bot commented Oct 23, 2023

ti-chi-bot bot commented Oct 23, 2023

ti-chi-bot commented Oct 23, 2023

ti-chi-bot commented Oct 23, 2023

rule_checker: fix the issue of not being able to achieve the better RegionFit #7219

rule_checker: fix the issue of not being able to achieve the better RegionFit #7219

Conversation

nolouch commented Oct 17, 2023 • edited Loading

What problem does this PR solve?

What is changed and how does it work?

Check List

Release note

ti-chi-bot bot commented Oct 17, 2023 • edited Loading

codecov bot commented Oct 17, 2023 • edited Loading

Codecov Report

nolouch commented Oct 20, 2023

CabinfeverB Oct 21, 2023

Choose a reason for hiding this comment

CabinfeverB Oct 21, 2023

Choose a reason for hiding this comment

nolouch Oct 23, 2023

Choose a reason for hiding this comment

CabinfeverB Oct 21, 2023

Choose a reason for hiding this comment

nolouch Oct 23, 2023 • edited Loading

Choose a reason for hiding this comment

bufferflies Oct 23, 2023 • edited Loading

Choose a reason for hiding this comment

nolouch Oct 23, 2023

Choose a reason for hiding this comment

bufferflies Oct 23, 2023

Choose a reason for hiding this comment

bufferflies left a comment

Choose a reason for hiding this comment

nolouch commented Oct 23, 2023

ti-chi-bot bot commented Oct 23, 2023

ti-chi-bot bot commented Oct 23, 2023

ti-chi-bot bot commented Oct 23, 2023

ti-chi-bot commented Oct 23, 2023

ti-chi-bot commented Oct 23, 2023

nolouch commented Oct 17, 2023 •

edited

Loading

ti-chi-bot bot commented Oct 17, 2023 •

edited

Loading

codecov bot commented Oct 17, 2023 •

edited

Loading

nolouch Oct 23, 2023 •

edited

Loading

bufferflies Oct 23, 2023 •

edited

Loading