dxf: add manual recovery mode #59641

D3Hunter · 2025-02-19T07:34:48Z

What problem does this PR solve?

Issue Number: ref #59640

Problem Summary:

What changed and how does it work?

add extra_params field to task system tables to store extra params used by the framework
add ManualRecovery, when enabled, the task will move to awaiting-resolution state when some subtask fail

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 · 2025-02-19T07:35:12Z

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 · 2025-02-19T07:53:39Z

Codecov Report

Attention: Patch coverage is 77.02703% with 17 lines in your changes missing coverage. Please review.

Project coverage is 74.8973%. Comparing base (b45a9e8) to head (27e3283).
Report is 18 commits behind head on master.

Additional details and impacted files

@@               Coverage Diff                @@
##             master     #59641        +/-   ##
================================================
+ Coverage   72.9779%   74.8973%   +1.9194%     
================================================
  Files          1694       1744        +50     
  Lines        468758     480723     +11965     
================================================
+ Hits         342090     360049     +17959     
+ Misses       105596      98140      -7456     
- Partials      21072      22534      +1462

Flag	Coverage Δ
integration	`48.7935% <0.0000%> (?)`
unit	`72.2672% <77.0270%> (+0.0913%)`	⬆️

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

Components	Coverage Δ
dumpling	`52.6910% <ø> (ø)`
parser	`∅ <ø> (∅)`
br	`61.1746% <ø> (+16.0970%)`	⬆️

D3Hunter · 2025-02-24T02:02:24Z

@lance6716 ptal

Copilot

Copilot reviewed 7 out of 22 changed files in this pull request and generated 2 comments.

Files not reviewed (15)

pkg/disttask/framework/integrationtests/BUILD.bazel: Language not supported
pkg/disttask/framework/storage/task_state_test.go: Evaluated as low risk
pkg/disttask/framework/taskexecutor/task_executor_testkit_test.go: Evaluated as low risk
pkg/disttask/importinto/job_testkit_test.go: Evaluated as low risk
pkg/disttask/framework/scheduler/scheduler_manager_test.go: Evaluated as low risk
pkg/disttask/framework/scheduler/interface.go: Evaluated as low risk
pkg/ddl/backfilling_dist_scheduler_test.go: Evaluated as low risk
pkg/disttask/framework/handle/handle.go: Evaluated as low risk
pkg/disttask/framework/scheduler/scheduler_test.go: Evaluated as low risk
pkg/disttask/framework/storage/task_table.go: Evaluated as low risk
pkg/disttask/framework/planner/planner.go: Evaluated as low risk
pkg/disttask/framework/storage/table_test.go: Evaluated as low risk
pkg/disttask/framework/storage/task_state.go: Evaluated as low risk
pkg/disttask/framework/testutil/disttest_util.go: Evaluated as low risk
pkg/disttask/framework/doc.go: Evaluated as low risk

Copilot · 2025-02-24T02:32:09Z

pkg/disttask/framework/integrationtests/framework_err_handling_test.go

+		tk.MustExec(fmt.Sprintf("update mysql.tidb_background_subtask set state='pending' where state='failed' and task_key= %d", taskID))
+		tk.MustExec(fmt.Sprintf("update mysql.tidb_global_task set state='running' where id = %d", taskID))


The task key is being used directly in the SQL query, which could lead to SQL injection vulnerabilities. Use parameterized queries to avoid potential issues.

Suggested change

tk.MustExec(fmt.Sprintf("update mysql.tidb_background_subtask set state='pending' where state='failed' and task_key= %d", taskID))

tk.MustExec(fmt.Sprintf("update mysql.tidb_global_task set state='running' where id = %d", taskID))

tk.MustExec("update mysql.tidb_background_subtask set state='pending' where state='failed' and task_key=?", taskID)

tk.MustExec("update mysql.tidb_global_task set state='running' where id=?", taskID)

Copilot · 2025-02-24T02:32:09Z

pkg/disttask/framework/integrationtests/framework_err_handling_test.go

+		tk.MustExec(fmt.Sprintf("update mysql.tidb_background_subtask set state='pending' where state='failed' and task_key= %d", taskID))
+		tk.MustExec(fmt.Sprintf("update mysql.tidb_global_task set state='running' where id = %d", taskID))


The task ID is being used directly in the SQL query, which could lead to SQL injection vulnerabilities. Use parameterized queries to avoid potential issues.

Suggested change

tk.MustExec(fmt.Sprintf("update mysql.tidb_background_subtask set state='pending' where state='failed' and task_key= %d", taskID))

tk.MustExec(fmt.Sprintf("update mysql.tidb_global_task set state='running' where id = %d", taskID))

tk.MustExec("update mysql.tidb_background_subtask set state='pending' where state='failed' and task_key= ?", taskID)

tk.MustExec("update mysql.tidb_global_task set state='running' where id = ?", taskID)

lance6716

/hold
free to unhold

pkg/session/bootstrap.go

ti-chi-bot · 2025-02-24T02:37:46Z

[LGTM Timeline notifier]

Timeline:

2025-02-20 06:36:33.758211771 +0000 UTC m=+1116036.154433833: ☑️ agreed by tangenta.
2025-02-24 02:37:45.128758867 +0000 UTC m=+237013.081917128: ☑️ agreed by lance6716.

D3Hunter · 2025-02-24T05:51:17Z

/unhold

ti-chi-bot · 2025-02-24T06:01:33Z

[APPROVALNOTIFIER] This PR is APPROVED

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

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:

~~pkg/ddl/OWNERS~~ [lance6716,tangenta]
~~pkg/disttask/OWNERS~~ [lance6716,tangenta]
~~pkg/session/OWNERS~~ [yudongusa]

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

D3Hunter · 2025-02-24T06:45:39Z

/retest

tiprow · 2025-02-24T06:46:01Z

@D3Hunter: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/retest

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.

D3Hunter · 2025-02-24T07:32:24Z

/retest

tiprow · 2025-02-24T07:32:47Z

@D3Hunter: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/retest

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.

D3Hunter · 2025-02-24T08:28:59Z

/retest

tiprow · 2025-02-24T08:29:23Z

@D3Hunter: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/retest

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.

D3Hunter · 2025-02-24T09:13:27Z

/retest

tiprow · 2025-02-24T09:13:53Z

@D3Hunter: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/retest

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.

ref pingcap#59640

D3Hunter added 4 commits February 19, 2025 11:46

change

c18a294

change

83bb880

doc

6703cb5

mock

7109a9f

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 Feb 19, 2025

fix test

c70fa69

tangenta approved these changes Feb 20, 2025

View reviewed changes

ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Feb 20, 2025

D3Hunter mentioned this pull request Feb 20, 2025

import: add a hidden option to enable manual recover for debug purpose #59674

Merged

13 tasks

D3Hunter added 2 commits February 20, 2025 16:27

Merge remote-tracking branch 'upstream/master' into dxf-manual-resolve

ce55c0a

make AwaitingResolution cancellable

9941b6d

lance6716 requested a review from Copilot February 24, 2025 02:29

Copilot AI reviewed Feb 24, 2025

View reviewed changes

lance6716 approved these changes Feb 24, 2025

View reviewed changes

pkg/session/bootstrap.go Outdated Show resolved Hide resolved

ti-chi-bot bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Feb 24, 2025

fix comment

27e3283

ti-chi-bot bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 24, 2025

yudongusa approved these changes Feb 24, 2025

View reviewed changes

ti-chi-bot bot added the approved label Feb 24, 2025

ti-chi-bot bot merged commit 246a241 into pingcap:master Feb 24, 2025
25 checks passed

D3Hunter deleted the dxf-manual-resolve branch February 24, 2025 09:44

zeminzhou pushed a commit to zeminzhou/tidb that referenced this pull request May 6, 2025

dxf: add manual recovery mode (pingcap#59641)

78f710f

ref pingcap#59640

		tk.MustExec(fmt.Sprintf("update mysql.tidb_background_subtask set state='pending' where state='failed' and task_key= %d", taskID))
		tk.MustExec(fmt.Sprintf("update mysql.tidb_global_task set state='running' where id = %d", taskID))

dxf: add manual recovery mode #59641

dxf: add manual recovery mode #59641

Uh oh!

Conversation

D3Hunter commented Feb 19, 2025

What problem does this PR solve?

What changed and how does it work?

Check List

Release note

Uh oh!

tiprow bot commented Feb 19, 2025

Uh oh!

codecov bot commented Feb 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

D3Hunter commented Feb 24, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 24, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 24, 2025

Choose a reason for hiding this comment

Uh oh!

lance6716 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ti-chi-bot bot commented Feb 24, 2025

[LGTM Timeline notifier]

Uh oh!

D3Hunter commented Feb 24, 2025

Uh oh!

ti-chi-bot bot commented Feb 24, 2025

Uh oh!

D3Hunter commented Feb 24, 2025

Uh oh!

tiprow bot commented Feb 24, 2025

Uh oh!

D3Hunter commented Feb 24, 2025

Uh oh!

tiprow bot commented Feb 24, 2025

Uh oh!

D3Hunter commented Feb 24, 2025

Uh oh!

tiprow bot commented Feb 24, 2025

Uh oh!

D3Hunter commented Feb 24, 2025

Uh oh!

tiprow bot commented Feb 24, 2025

Uh oh!

Uh oh!

Uh oh!

codecov bot commented Feb 19, 2025 •

edited

Loading