Skip to content

scheduler: revert two unstable optimization in hot scheduler #5392

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
Merged
merged 2 commits into from
Aug 4, 2022
Merged

scheduler: revert two unstable optimization in hot scheduler #5392

merged 2 commits into from
Aug 4, 2022

Conversation

lhy1024
Copy link
Contributor

@lhy1024 lhy1024 commented Aug 3, 2022 •
edited
Loading

What problem does this PR solve?

Issue Number: Ref tikv/tikv#13095

What is changed and how does it work?

revert #4931 and #4912

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)

when strict-picking is false, tpcc bench will be more stable after revert these two pr.

only revert anyof policy(#5384), baseline is 84k

origin_img_v2_4f37c26d-9b21-42f3-ae71-cf72c7f2797g

after this pr, it is back to 84k.

image

origin_img_v2_aa7cee6f-afe5-4d87-84c3-f263714e36cg

Release note

None.

lhy1024 added 2 commits August 3, 2022 15:05
@lhy1024
Revert "scheduler: support the hot-region-scheduler to generate multi…
1b7ebc2 
…ple operators at the same time (tikv#4931)"

This reverts commit 8ab5c16.

Signed-off-by: lhy1024 <admin@liudos.us>

Conflicts:
	server/schedulers/hot_region_test.go
@lhy1024
Revert "scheduler: enlarge the search space so that the hot-scheduler…
0a19e29 
… can still schedule under dimensional conflicts (tikv#4912)"

    This reverts commit  726d345.

Signed-off-by: lhy1024 <admin@liudos.us>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 3, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • HunDunDM
  • 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 added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. do-not-merge/cherry-pick-not-approved release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Aug 3, 2022
@ti-chi-bot ti-chi-bot requested review from disksing and rleungx August 3, 2022 07:15
@codecov
Copy link

codecov bot commented Aug 3, 2022 •
edited
Loading

Codecov Report

Merging #5392 (0a19e29) into release-6.2 (989134e) will decrease coverage by 0.25%.
The diff coverage is 95.31%.

@@               Coverage Diff               @@
##           release-6.2    #5392      +/-   ##
===============================================
- Coverage        75.77%   75.51%   -0.26%     
===============================================
  Files              312      312              
  Lines            31067    30965     -102     
===============================================
- Hits             23540    23384     -156     
- Misses            5530     5574      +44     
- Partials          1997     2007      +10
Flag Coverage Δ
unittests 75.51% <95.31%> (-0.26%) ⬇️

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

Impacted Files Coverage Δ
server/statistics/store_load.go 95.76% <ø> (-0.04%) ⬇️
server/schedulers/hot_region.go 83.33% <95.23%> (-0.59%) ⬇️
server/statistics/store_hot_peers_infos.go 100.00% <100.00%> (ø)
server/tso/local_allocator.go 64.86% <0.00%> (-13.52%) ⬇️
server/storage/kv/etcd_kv.go 69.56% <0.00%> (-10.15%) ⬇️
server/schedulers/shuffle_hot_region.go 55.55% <0.00%> (-10.11%) ⬇️
server/tso/allocator_manager.go 62.18% <0.00%> (-5.81%) ⬇️
server/storage/endpoint/meta.go 63.63% <0.00%> (-4.55%) ⬇️
server/election/lease.go 84.05% <0.00%> (-4.35%) ⬇️
server/tso/tso.go 67.79% <0.00%> (-3.96%) ⬇️
... and 19 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Aug 3, 2022
@lhy1024 lhy1024 mentioned this pull request Aug 4, 2022
Closed
@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Aug 4, 2022
@lhy1024 lhy1024 requested review from HunDunDM and nolouch and removed request for disksing and rleungx August 4, 2022 03:13
@nolouch nolouch marked this pull request as ready for review August 4, 2022 03:15
@ti-chi-bot ti-chi-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 4, 2022
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 4, 2022
@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 4, 2022
@nolouch
Copy link
Contributor

nolouch commented Aug 4, 2022

/merge

@ti-chi-bot
Copy link
Member

@nolouch: 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: 0a19e29

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Aug 4, 2022
@ti-chi-bot ti-chi-bot merged commit e3d48eb into tikv:release-6.2 Aug 4, 2022
@lhy1024 lhy1024 deleted the revert-hot-scheduler branch August 8, 2022 08:22
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

@HunDunDM HunDunDM HunDunDM approved these changes

Assignees
No one assigned
Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. 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.
5 participants
@lhy1024 @ti-chi-bot @nolouch @HunDunDM @VelocityLight