dxf: handle modifying task concurrency in scheduler #57673

D3Hunter · 2024-11-25T08:01:53Z

What problem does this PR solve?

Issue Number: ref #57497

Problem Summary:

What changed and how does it work?

handle modify task concurrency in scheduler

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

Release note

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

None

tiprow · 2024-11-25T08:02:08Z

Hi @D3Hunter. 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-sigs/prow repository.

codecov · 2024-11-25T08:36:03Z

Codecov Report

Attention: Patch coverage is 83.07692% with 11 lines in your changes missing coverage. Please review.

Project coverage is 73.2910%. Comparing base (d02d48a) to head (a644ea7).
Report is 51 commits behind head on master.

Additional details and impacted files

@@               Coverage Diff                @@
##             master     #57673        +/-   ##
================================================
+ Coverage   72.8318%   73.2910%   +0.4592%     
================================================
  Files          1677       1679         +2     
  Lines        463944     475826     +11882     
================================================
+ Hits         337899     348738     +10839     
- Misses       105169     106306      +1137     
+ Partials      20876      20782        -94

Flag	Coverage Δ
integration	`44.5828% <1.7543%> (?)`
unit	`72.2249% <83.0769%> (+0.0011%)`	⬆️

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

Components	Coverage Δ
dumpling	`52.7673% <ø> (ø)`
parser	`∅ <ø> (∅)`
br	`43.1377% <ø> (-2.3736%)`	⬇️

lance6716

will review unit test files later

pkg/disttask/framework/proto/modify.go

lance6716 · 2024-12-02T06:55:55Z

pkg/disttask/framework/scheduler/interface.go

 	PausedTask(ctx context.Context, taskID int64) error
 	// ResumedTask updated task state from resuming to running.
 	ResumedTask(ctx context.Context, taskID int64) error
+	// ModifiedTask tries to update task concurrency and meta, and update state


When reading it I'm not clear about

Seems configurations other than concurrency, meta and state can't be modified? When we want to support more modification like Priority, we will update this comment?

What's the prev_state? Now by checking the code I see it's a field of ModifyParam. I think it's better to mention how we can use fields of the parameter task *proto.Task to modify.

What's the meaning of "update state back to prev-state" Back meaning there's a checking that prev-state must be a state that happened in history?

state is not a param, it's for changing state back to the state before modify, see this state machine https://github.com/pingcap/tidb/pull/57557/files#diff-9cbb4aa7310f95ed10a52e14e392efa29e0356b179e85efec38db8fde5dca9f3R57-R67. for priority, yes

for 2/3. see above link

lance6716 · 2024-12-02T07:03:56Z

pkg/disttask/framework/storage/task_state.go

+		// subtask might have different concurrency later, see TaskExecInfo, we
+		// need to handle it too, but ok for now.
+		_, err = sqlexec.ExecSQL(ctx, se.GetSQLExecutor(), `
+			update mysql.tidb_background_subtask


Just learning, how do we let subtask executor know the concurrency is changed?

lance6716 · 2024-12-02T08:22:22Z

pkg/disttask/framework/integrationtests/modify_test.go

+		})
+	})
+
+	t.Run("modify pending task concurrency, but other owner already done it", func(t *testing.T) {


The test purpose is "..but other owner already done it". Should we trigger ModifiedTask after WaitTaskDone and check the concurrency is not changed?

Should we trigger ModifiedTask after WaitTaskDone

the scenario is

task change to modifying state

owner A tried to do modify work, but before it start, another owner B finished the modify

owner A does nothing

check the concurrency is not changed?

on owner A, we check by AffectedRows() == 0

ti-chi-bot · 2024-12-02T13:17:20Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lance6716, tangenta

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:

~~OWNERS~~ [lance6716,tangenta]
~~pkg/disttask/OWNERS~~ [lance6716,tangenta]

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 · 2024-12-02T13:17:23Z

[LGTM Timeline notifier]

Timeline:

2024-12-02 08:23:53.50750323 +0000 UTC m=+1056821.127157742: ☑️ agreed by lance6716.
2024-12-02 13:17:22.86376479 +0000 UTC m=+1074430.483419307: ☑️ agreed by tangenta.

tiprow · 2024-12-02T13:18:56Z

@D3Hunter: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
fast_test_tiprow	`a644ea7`	link	true	`/test fast_test_tiprow`

Full PR test history. Your PR dashboard.

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-sigs/prow repository. I understand the commands that are listed here.

D3Hunter added 8 commits November 25, 2024 15:51

change

d6b111f

change

360bc5d

change

6a05338

test

13292af

test

e2d0c3c

test

5d52fb0

test

707ac54

change

c9df0c4

ti-chi-bot bot added 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 Nov 25, 2024

D3Hunter added 2 commits November 25, 2024 16:08

change

19e7d34

change

58bfa03

D3Hunter changed the title ~~dxf: handle modifying in scheduler part~~ dxf: handle modifying in scheduler Nov 25, 2024

D3Hunter changed the title ~~dxf: handle modifying in scheduler~~ dxf: handle modifying task concurrency in scheduler Nov 25, 2024

D3Hunter added 2 commits November 26, 2024 11:55

Merge remote-tracking branch 'upstream/master' into dxf-scheduler

ab253dd

fix conflict

a644ea7

D3Hunter requested review from lance6716 and tangenta November 29, 2024 09:34

lance6716 reviewed Dec 2, 2024

View reviewed changes

lance6716 approved these changes Dec 2, 2024

View reviewed changes

ti-chi-bot bot added approved needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Dec 2, 2024

tangenta approved these changes Dec 2, 2024

View reviewed changes

ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Dec 2, 2024

ti-chi-bot bot merged commit e631ba8 into pingcap:master Dec 2, 2024
21 of 24 checks passed

D3Hunter deleted the dxf-scheduler branch December 3, 2024 02:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

dxf: handle modifying task concurrency in scheduler #57673

dxf: handle modifying task concurrency in scheduler #57673

D3Hunter commented Nov 25, 2024 •

edited

Loading

tiprow bot commented Nov 25, 2024

codecov bot commented Nov 25, 2024 •

edited

Loading

lance6716 left a comment

lance6716 Dec 2, 2024

D3Hunter Dec 2, 2024 •

edited

Loading

lance6716 Dec 2, 2024

lance6716 Dec 2, 2024

D3Hunter Dec 2, 2024

ti-chi-bot bot commented Dec 2, 2024

ti-chi-bot bot commented Dec 2, 2024

tiprow bot commented Dec 2, 2024

dxf: handle modifying task concurrency in scheduler #57673

dxf: handle modifying task concurrency in scheduler #57673

Conversation

D3Hunter commented Nov 25, 2024 • edited Loading

What problem does this PR solve?

What changed and how does it work?

Check List

Release note

tiprow bot commented Nov 25, 2024

codecov bot commented Nov 25, 2024 • edited Loading

Codecov Report

lance6716 left a comment

Choose a reason for hiding this comment

lance6716 Dec 2, 2024

Choose a reason for hiding this comment

D3Hunter Dec 2, 2024 • edited Loading

Choose a reason for hiding this comment

lance6716 Dec 2, 2024

Choose a reason for hiding this comment

lance6716 Dec 2, 2024

Choose a reason for hiding this comment

D3Hunter Dec 2, 2024

Choose a reason for hiding this comment

ti-chi-bot bot commented Dec 2, 2024

ti-chi-bot bot commented Dec 2, 2024

[LGTM Timeline notifier]

tiprow bot commented Dec 2, 2024

D3Hunter commented Nov 25, 2024 •

edited

Loading

codecov bot commented Nov 25, 2024 •

edited

Loading

D3Hunter Dec 2, 2024 •

edited

Loading