ddl: improve FLASHBACK DATABASE for many table case #54439

lance6716 · 2024-07-04T07:12:43Z

What problem does this PR solve?

Issue Number: close #54415

moving reading dropped TableInfo from job submit node to DDL owner, because it's too long to persist all TableInfo

Problem Summary:

What changed and how does it work?

Check List

Tests

Unit test
Integration test
Manual test (add detailed scripts or steps below) 100k tables under a DB failde at last step which is writting "schema diff". Will fix it in separate PR.
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

Signed-off-by: lance6716 <[email protected]>

tiprow · 2024-07-04T07:13:09Z

Hi @lance6716. 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.

lance6716 · 2024-07-04T07:15:45Z

/check-issue-triage-complete

codecov · 2024-07-04T07:31:28Z

Codecov Report

Attention: Patch coverage is 83.63636% with 9 lines in your changes missing coverage. Please review.

Project coverage is 56.1689%. Comparing base (a490882) to head (a4c9f95).
Report is 10 commits behind head on master.

Additional details and impacted files

@@                Coverage Diff                @@
##             master     #54439         +/-   ##
=================================================
- Coverage   72.9150%   56.1689%   -16.7461%     
=================================================
  Files          1549       1670        +121     
  Lines        436294     611996     +175702     
=================================================
+ Hits         318124     343752      +25628     
- Misses        98671     244965     +146294     
- Partials      19499      23279       +3780

Flag	Coverage Δ
integration	`37.3936% <0.0000%> (?)`
unit	`71.9232% <83.6363%> (-0.0239%)`	⬇️

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

Components	Coverage Δ
dumpling	`52.9656% <ø> (ø)`
parser	`∅ <ø> (∅)`
br	`52.5994% <ø> (+6.7354%)`	⬆️

Signed-off-by: lance6716 <[email protected]>

lance6716 · 2024-07-05T06:24:40Z

/retest

tiprow · 2024-07-05T06:25:03Z

@lance6716: 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.

Signed-off-by: lance6716 <[email protected]>

D3Hunter · 2024-07-09T05:38:38Z

pkg/ddl/ddl.go

+	// RecoverSchemaIDOnOwner is the new logic to avoid a large RecoverTabsInfo can't
+	// be persisted. If it's set, DDL owner will recover RecoverTabsInfo instead of
+	// job submit node.
+	RecoverSchemaIDOnOwner int64


seems this id duplicate with job.SchemaID and *model.DBInfo.ID in this struct, maybe add a LoadOnExecute bool?

D3Hunter · 2024-07-09T05:41:52Z

pkg/executor/recover_test.go

+	tk.MustGetErrMsg("flashback database test_flashback", "[ddl:-1]DDL job rollback, error msg: mock error for clearTablePlacementAndBundles")
+	require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/ddl/mockClearTablePlacementAndBundlesErr", `1*return()`))
+	tk.MustExec("flashback database test_flashback")
+	require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/ddl/mockClearTablePlacementAndBundlesErr"))


Suggested change

require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/ddl/mockClearTablePlacementAndBundlesErr"))

testfailpoint.Disable(t, "github.com/pingcap/tidb/pkg/ddl/mockClearTablePlacementAndBundlesErr"))

previous too

D3Hunter · 2024-07-09T05:45:57Z

pkg/ddl/ddl_worker.go

+		if err == nil && job.State != model.JobStateRollingback && job.State != model.JobStateCancelled {
+			// must let `runDDLJob` return an error, otherwise `needUpdateRawArgs` will
+			// marshal empty Args into RawArgs.
+			err = errors.New("job can't be cancelled")
+		}
+		return ver, err


convertJob2RollbackJob also checks job state, we can merge this part into it.

Signed-off-by: lance6716 <[email protected]>

ti-chi-bot · 2024-07-11T06:34:56Z

[LGTM Timeline notifier]

Timeline:

2024-07-10 02:31:25.062526289 +0000 UTC m=+411182.297760402: ☑️ agreed by D3Hunter.
2024-07-11 06:34:55.900312996 +0000 UTC m=+512193.135547112: ☑️ agreed by tangenta.

lance6716 · 2024-07-11T06:35:41Z

/retest

tiprow · 2024-07-11T06:36:54Z

@lance6716: 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	`85c7faf`	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.

lance6716 · 2024-07-11T08:19:25Z

/retest

tiprow · 2024-07-11T08:19:46Z

@lance6716: 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.

lance6716 · 2024-07-11T09:04:32Z

/retest

tiprow · 2024-07-11T09:04:54Z

@lance6716: 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.

lance6716 · 2024-07-11T12:47:38Z

/retest

tiprow · 2024-07-11T12:48:08Z

@lance6716: 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.

lance6716 · 2024-07-12T05:04:54Z

/hold

Signed-off-by: lance6716 <[email protected]>

tangenta · 2024-07-12T07:27:28Z

pkg/ddl/table.go

+	err = clearTablePlacementAndBundles(w.ctx, recoverInfo.TableInfo)
+	if err != nil {
+		return ver, errors.Trace(err)
+	}


This function sends a HTTP request. If there is a performance issue for onRecoverSchema, we can solve it by batching bundles from all involved tableInfo.

lance6716 · 2024-07-12T07:29:56Z

/unhold

ti-chi-bot · 2024-07-12T07:30:53Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: D3Hunter, 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~~ [D3Hunter,tangenta]
~~pkg/ddl/OWNERS~~ [tangenta]
~~pkg/domain/OWNERS~~ [D3Hunter,tangenta]

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

lance6716 · 2024-07-12T08:00:21Z

/retest

tiprow · 2024-07-12T08:00:42Z

@lance6716: 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.

lance6716 · 2024-07-12T08:19:08Z

/retest

tiprow · 2024-07-12T08:19:29Z

@lance6716: 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.

lance6716 · 2024-07-13T04:59:25Z

/retest

tiprow · 2024-07-13T04:59:53Z

@lance6716: 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.

ti-chi-bot · 2024-07-13T05:55:16Z

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

Signed-off-by: ti-chi-bot <[email protected]>

close #54415

ddl: FLASHBACK DATABASE read TableInfo on DDL owner

8037dc3

Signed-off-by: lance6716 <[email protected]>

ti-chi-bot bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. do-not-merge/needs-triage-completed release-note-none size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jul 4, 2024

ti-chi-bot bot removed the do-not-merge/needs-triage-completed label Jul 4, 2024

lance6716 added 6 commits July 4, 2024 16:26

fix wrong TS

3e259fe

Signed-off-by: lance6716 <[email protected]>

cancel the job

bf27eac

Signed-off-by: lance6716 <[email protected]>

fix wrong schema ID

f6edeb9

Signed-off-by: lance6716 <[email protected]>

--wip-- [skip ci]

a3acf27

--wip-- [skip ci]

3d1b044

fix empty diff

ae7cca6

Signed-off-by: lance6716 <[email protected]>

fix UT

359156e

Signed-off-by: lance6716 <[email protected]>

lance6716 changed the title ~~[WIP]ddl: FLASHBACK DATABASE read TableInfo on DDL owner~~ ddl: improve FLASHBACK DATABASE for many table case and retry case Jul 5, 2024

ti-chi-bot bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 5, 2024

D3Hunter reviewed Jul 9, 2024

View reviewed changes

address comment

85c7faf

Signed-off-by: lance6716 <[email protected]>

D3Hunter approved these changes Jul 10, 2024

View reviewed changes

ti-chi-bot bot added the needs-1-more-lgtm label Jul 10, 2024

tangenta approved these changes Jul 11, 2024

View reviewed changes

ti-chi-bot bot added approved lgtm and removed needs-1-more-lgtm labels Jul 11, 2024

ti-chi-bot added the needs-cherry-pick-release-7.5 label Jul 11, 2024

Merge branch 'master' of github.com:pingcap/tidb into fix54415

5d9c988

ti-chi-bot bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 12, 2024

add a TODO

a4c9f95

Signed-off-by: lance6716 <[email protected]>

lance6716 changed the title ~~ddl: improve FLASHBACK DATABASE for many table case and retry case~~ ddl: improve FLASHBACK DATABASE for many table case Jul 12, 2024

tangenta reviewed Jul 12, 2024

View reviewed changes

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 Jul 12, 2024

tangenta approved these changes Jul 12, 2024

View reviewed changes

ti-chi-bot bot merged commit 8b78a4f into pingcap:master Jul 13, 2024
21 checks passed

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Jul 13, 2024

This is an automated cherry-pick of pingcap#54439

50aafe1

Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot mentioned this pull request Jul 13, 2024

ddl: improve FLASHBACK DATABASE for many table case (#54439) #54602

Merged

13 tasks

ti-chi-bot bot pushed a commit that referenced this pull request Jul 15, 2024

ddl: improve FLASHBACK DATABASE for many table case (#54439) (#54602)

37bf4e9

close #54415

lance6716 mentioned this pull request Jul 16, 2024

*: don't save table IDs in schema diff of FLASHBACK DATABASE #54665

Open

13 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ddl: improve FLASHBACK DATABASE for many table case #54439

ddl: improve FLASHBACK DATABASE for many table case #54439

lance6716 commented Jul 4, 2024 •

edited

Loading

tiprow bot commented Jul 4, 2024

lance6716 commented Jul 4, 2024

codecov bot commented Jul 4, 2024 •

edited

Loading

lance6716 commented Jul 5, 2024

tiprow bot commented Jul 5, 2024

D3Hunter Jul 9, 2024

D3Hunter Jul 9, 2024

D3Hunter Jul 9, 2024

ti-chi-bot bot commented Jul 11, 2024

lance6716 commented Jul 11, 2024

tiprow bot commented Jul 11, 2024

lance6716 commented Jul 11, 2024

tiprow bot commented Jul 11, 2024

lance6716 commented Jul 11, 2024

tiprow bot commented Jul 11, 2024

lance6716 commented Jul 11, 2024

tiprow bot commented Jul 11, 2024

lance6716 commented Jul 12, 2024

tangenta Jul 12, 2024

lance6716 commented Jul 12, 2024

ti-chi-bot bot commented Jul 12, 2024

lance6716 commented Jul 12, 2024

tiprow bot commented Jul 12, 2024

lance6716 commented Jul 12, 2024

tiprow bot commented Jul 12, 2024

lance6716 commented Jul 13, 2024

tiprow bot commented Jul 13, 2024

ti-chi-bot commented Jul 13, 2024

	require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/ddl/mockClearTablePlacementAndBundlesErr"))
	testfailpoint.Disable(t, "github.com/pingcap/tidb/pkg/ddl/mockClearTablePlacementAndBundlesErr"))

ddl: improve FLASHBACK DATABASE for many table case #54439

ddl: improve FLASHBACK DATABASE for many table case #54439

Conversation

lance6716 commented Jul 4, 2024 • edited Loading

What problem does this PR solve?

What changed and how does it work?

Check List

Release note

tiprow bot commented Jul 4, 2024

lance6716 commented Jul 4, 2024

codecov bot commented Jul 4, 2024 • edited Loading

Codecov Report

lance6716 commented Jul 5, 2024

tiprow bot commented Jul 5, 2024

D3Hunter Jul 9, 2024

Choose a reason for hiding this comment

D3Hunter Jul 9, 2024

Choose a reason for hiding this comment

D3Hunter Jul 9, 2024

Choose a reason for hiding this comment

ti-chi-bot bot commented Jul 11, 2024

[LGTM Timeline notifier]

lance6716 commented Jul 11, 2024

tiprow bot commented Jul 11, 2024

lance6716 commented Jul 11, 2024

tiprow bot commented Jul 11, 2024

lance6716 commented Jul 11, 2024

tiprow bot commented Jul 11, 2024

lance6716 commented Jul 11, 2024

tiprow bot commented Jul 11, 2024

lance6716 commented Jul 12, 2024

tangenta Jul 12, 2024

Choose a reason for hiding this comment

lance6716 commented Jul 12, 2024

ti-chi-bot bot commented Jul 12, 2024

lance6716 commented Jul 12, 2024

tiprow bot commented Jul 12, 2024

lance6716 commented Jul 12, 2024

tiprow bot commented Jul 12, 2024

lance6716 commented Jul 13, 2024

tiprow bot commented Jul 13, 2024

ti-chi-bot commented Jul 13, 2024

lance6716 commented Jul 4, 2024 •

edited

Loading

codecov bot commented Jul 4, 2024 •

edited

Loading