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

disttask: fix panic in task executor/scheduler #49877

Merged
merged 10 commits into from
Jan 2, 2024
Merged

disttask: fix panic in task executor/scheduler #49877

merged 10 commits into from
Jan 2, 2024

Conversation

ywqzzy
Copy link
Contributor

@ywqzzy ywqzzy commented Dec 28, 2023 •
edited
Loading

What problem does this PR solve?

Issue Number: close #49869

Problem Summary:

What changed and how does it work?

Add ErrTaskNotFound when getting tasks.

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/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 28, 2023
@tiprow tiprow
Copy link

tiprow bot commented Dec 28, 2023

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.

@ti-chi-bot ti-chi-bot bot added needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. and removed do-not-merge/needs-linked-issue labels Dec 28, 2023
@codecov Codecov
Copy link

codecov bot commented Dec 28, 2023 •
edited
Loading

Codecov Report

Merging #49877 (369a63a) into master (99f0349) will decrease coverage by 0.7230%.
The diff coverage is 0.0000%.

Additional details and impacted files 
@@               Coverage Diff                @@
##             master     #49877        +/-   ##
================================================
- Coverage   71.9002%   71.1772%   -0.7230%     
================================================
  Files          1437       1433         -4     
  Lines        345686     416484     +70798     
================================================
+ Hits         248549     296442     +47893     
- Misses        76907     101259     +24352     
+ Partials      20230      18783      -1447
Flag Coverage Δ
integration 43.8700% <0.0000%> (?)
unit 70.9407% <ø> (-0.9595%) ⬇️

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

Components Coverage Δ
dumpling 53.9663% <ø> (-2.3466%) ⬇️
parser ∅ <ø> (∅)
br 46.8777% <ø> (-4.3972%) ⬇️

D3Hunter
D3Hunter reviewed Jan 2, 2024
View reviewed changes
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/handle/handle.go Outdated
@@ -52,7 +52,7 @@ func SubmitTask(ctx context.Context, taskKey string, taskType proto.TaskType, co
return nil, err
}
task, err := taskManager.GetTaskByKey(ctx, taskKey)
if err != nil {
if err != nil || err != storage.ErrTaskNotFound {
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
if err != nil || err != storage.ErrTaskNotFound {
if err != nil && err != storage.ErrTaskNotFound {

Copy link
Contributor

Choose a reason for hiding this comment

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

we should return err if task already exists

@ywqzzy ywqzzy changed the title disttask: fix panic in task executor disttask: fix panic in task executor/scheduler Jan 2, 2024
@ti-chi-bot ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Jan 2, 2024
@ti-chi-bot ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Jan 2, 2024
@ti-chi-bot ti-chi-bot
Copy link

ti-chi-bot bot commented Jan 2, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-01-02 08:26:46.568831247 +0000 UTC m=+2159097.606058167: ☑️ agreed by D3Hunter.
  • 2024-01-02 09:23:23.393494175 +0000 UTC m=+2162494.430721102: ☑️ agreed by okJiang.

@ywqzzy
Copy link
Contributor Author

ywqzzy commented Jan 2, 2024

/approve

@ti-chi-bot ti-chi-bot
Copy link

ti-chi-bot bot commented Jan 2, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: D3Hunter, okJiang, ywqzzy

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 the approved label Jan 2, 2024
@hawkingrei
Copy link
Member

/retest

@ti-chi-bot ti-chi-bot bot merged commit 237b2c7 into pingcap:master Jan 2, 2024
17 checks passed
@ti-chi-bot ti-chi-bot mentioned this pull request Jan 2, 2024
Closed
13 tasks
@ti-chi-bot
Copy link
Member

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

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Jan 2, 2024
@ywqzzy @ti-chi-bot
This is an automated cherry-pick of pingcap#49877
5bb4c5a 
Signed-off-by: ti-chi-bot <[email protected]>
@ywqzzy ywqzzy mentioned this pull request Jan 16, 2024
Closed
31 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@okJiang okJiang okJiang approved these changes

@D3Hunter D3Hunter D3Hunter approved these changes

Assignees
No one assigned
Labels
approved lgtm needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

task executor panic when checking task
5 participants
@ywqzzy @hawkingrei @ti-chi-bot @D3Hunter @okJiang