Skip to content
This repository has been archived by the owner on Nov 24, 2023. It is now read-only.

worker: create subtask for paused stage #1165

Merged
merged 8 commits into from
Oct 19, 2020
Merged

worker: create subtask for paused stage #1165

merged 8 commits into from
Oct 19, 2020

Conversation

csuzhangxc
Copy link
Member

@csuzhangxc csuzhangxc commented Oct 14, 2020 •
edited
Loading

What problem does this PR solve?

close #1090

What is changed and how it works?

  • create subtask even for paused stage task
  • refine some logs

Check List

Tests

  • Unit test
  • Integration test

Code changes

  • Has exported function/method change

Side effects

  • Increased code complexity

Related changes

  • Need to cherry-pick to the release branch

@csuzhangxc csuzhangxc added priority/normal Minor change, requires approval from ≥1 primary reviewer status/WIP This PR is still work in progress type/bug-fix Bug fix needs-cherry-pick-release-2.0 This PR should be cherry-picked to release-2.0. Remove this label after cherry-picked to release-2.0 labels Oct 14, 2020
@csuzhangxc csuzhangxc added this to the v2.0.0 milestone Oct 14, 2020
@csuzhangxc csuzhangxc added status/PTAL This PR is ready for review. Add this label back after committing new changes and removed status/WIP This PR is still work in progress labels Oct 14, 2020
lance6716
lance6716 reviewed Oct 15, 2020
View reviewed changes
Copy link
Collaborator

@lance6716 lance6716 left a comment

Choose a reason for hiding this comment

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

LGTM

GMHDBJD
GMHDBJD reviewed Oct 16, 2020
View reviewed changes
dm/worker/worker.go
op = pb.TaskOp_Resume
} else if stage.Expect == pb.Stage_Paused {
op = pb.TaskOp_Pause
}
case stage.IsDeleted:
op = pb.TaskOp_Stop
Copy link
Collaborator

Choose a reason for hiding this comment

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

Will stop-task report ErrWorkerSubTaskNotFound?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, for stop-task, we won't create/init one subtask and then stop it.

GMHDBJD
GMHDBJD reviewed Oct 16, 2020
View reviewed changes
Copy link
Collaborator

@GMHDBJD GMHDBJD 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

@lance6716 lance6716 added the status/LGT1 One reviewer already commented LGTM label Oct 16, 2020
GMHDBJD
GMHDBJD approved these changes Oct 19, 2020
View reviewed changes
Copy link
Collaborator

@GMHDBJD GMHDBJD left a comment

Choose a reason for hiding this comment

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

LGTM

@GMHDBJD GMHDBJD added status/LGT2 Two reviewers already commented LGTM, ready for merge and removed status/LGT1 One reviewer already commented LGTM labels Oct 19, 2020
@csuzhangxc
Copy link
Member Author

/run-all-tests

@csuzhangxc csuzhangxc merged commit 925c59b into pingcap:master Oct 19, 2020
@csuzhangxc csuzhangxc deleted the handle-paused branch October 19, 2020 06:27
ti-srebot pushed a commit to ti-srebot/dm that referenced this pull request Oct 19, 2020
@csuzhangxc @ti-srebot
cherry pick pingcap#1165 to release-2.0
9bab3a3 
Signed-off-by: ti-srebot <[email protected]>
@ti-srebot ti-srebot mentioned this pull request Oct 19, 2020
Merged
@ti-srebot
Copy link

cherry pick to release-2.0 in PR #1183

@ti-srebot ti-srebot added already-cherry-pick-2.0 The related PR is already cherry-picked to release-2.0. Add this label once the PR is cherry-picked and removed needs-cherry-pick-release-2.0 This PR should be cherry-picked to release-2.0. Remove this label after cherry-picked to release-2.0 labels Oct 19, 2020
csuzhangxc added a commit that referenced this pull request Oct 19, 2020
@ti-srebot @csuzhangxc
worker: create subtask for paused stage (#1165)
14d6aad 
Signed-off-by: ti-srebot <[email protected]>

Co-authored-by: Xuecheng Zhang <[email protected]>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lance6716 lance6716 lance6716 left review comments

@GMHDBJD GMHDBJD GMHDBJD approved these changes

Assignees
No one assigned
Labels
already-cherry-pick-2.0 The related PR is already cherry-picked to release-2.0. Add this label once the PR is cherry-picked priority/normal Minor change, requires approval from ≥1 primary reviewer status/LGT2 Two reviewers already commented LGTM, ready for merge status/PTAL This PR is ready for review. Add this label back after committing new changes type/bug-fix Bug fix
Projects
None yet
Milestone
v2.0.0
Development

Successfully merging this pull request may close these issues.

support to query/operate paused subtask after re-scheduled
4 participants
@csuzhangxc @ti-srebot @lance6716 @GMHDBJD