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

disttask: skip scheduler take slots for some states #51022

Merged
merged 20 commits into from
Mar 11, 2024

Conversation

ywqzzy
Copy link
Contributor

@ywqzzy ywqzzy commented Feb 7, 2024

What problem does this PR solve?

Issue Number: ref #49008

Problem Summary:

  1. For reverting/cancelling/pausing, we can start scheduler without allocating slots
  2. As scheduler is a loop. For a task in pausing state, if the scheduler is started without allocating slots, and if the task enters the running state by another scheduler, or enters the resuming state in the refresh interval, it should not start running without allocating slots(just exit).

What changed and how does it work?

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No need to test
    • I checked and no code files have been changed.

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

None

@ti-chi-bot ti-chi-bot bot added do-not-merge/needs-linked-issue do-not-merge/needs-tests-checked release-note-none Denotes a PR that doesn't merit a release note. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Feb 7, 2024
Copy link

tiprow bot commented Feb 7, 2024

Hi @ywqzzy. Thanks for your PR.

PRs from untrusted users cannot be marked as trusted with /ok-to-test in this repo meaning untrusted PR authors can never trigger tests themselves. Collaborators can still trigger tests on the PR using /test all.

I understand the commands that are listed here.

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 kubernetes/test-infra repository.

Copy link

codecov bot commented Feb 7, 2024

Codecov Report

Merging #51022 (a80169f) into master (1e5c179) will increase coverage by 2.3164%.
Report is 4 commits behind head on master.
The diff coverage is 81.5789%.

Additional details and impacted files
@@               Coverage Diff                @@
##             master     #51022        +/-   ##
================================================
+ Coverage   70.7159%   73.0324%   +2.3164%     
================================================
  Files          1472       1487        +15     
  Lines        436996     452807     +15811     
================================================
+ Hits         309026     330696     +21670     
+ Misses       108595     101757      -6838     
- Partials      19375      20354       +979     
Flag Coverage Δ
integration 48.6552% <44.7368%> (?)
unit 70.4626% <81.5789%> (-0.0579%) ⬇️

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

Components Coverage Δ
dumpling 54.2644% <ø> (+0.2686%) ⬆️
parser ∅ <ø> (∅)
br 51.2533% <ø> (+5.3663%) ⬆️

@ti-chi-bot ti-chi-bot bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Feb 7, 2024
Copy link
Contributor

@D3Hunter D3Hunter left a comment

Choose a reason for hiding this comment

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

rest lgtm

pkg/disttask/framework/scheduler/scheduler_manager.go Outdated Show resolved Hide resolved
}

func TestManagerSchedulerNotAllocateSlots(t *testing.T) {
require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/disttask/framework/scheduler/exitScheduler", "return()"))
Copy link
Contributor

Choose a reason for hiding this comment

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

no need this failpoint, we can mock scheduler directly

for the second case we can test it through scheduler, not manager

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I use manager to test allocateSlots for each scheduler.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Will refine it next week

pkg/disttask/framework/scheduler/scheduler.go Show resolved Hide resolved
pkg/disttask/framework/scheduler/scheduler_test.go Outdated Show resolved Hide resolved
@ywqzzy ywqzzy requested a review from D3Hunter February 26, 2024 05:20
Copy link
Contributor

@D3Hunter D3Hunter left a comment

Choose a reason for hiding this comment

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

rest lgtm

@ti-chi-bot ti-chi-bot bot added approved needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Feb 26, 2024
Copy link

ti-chi-bot bot commented Mar 11, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: D3Hunter, wjhuang2016

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Mar 11, 2024
Copy link

ti-chi-bot bot commented Mar 11, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-02-26 06:43:50.864950111 +0000 UTC m=+857919.612573221: ☑️ agreed by D3Hunter.
  • 2024-03-11 03:37:17.481307486 +0000 UTC m=+656664.503553874: ☑️ agreed by wjhuang2016.

@ti-chi-bot ti-chi-bot bot merged commit 8b02143 into pingcap:master Mar 11, 2024
21 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants