ddl: merge continuous key ranges in FLASHBACK CLUSTER job args #54914

lance6716 · 2024-07-25T11:28:11Z

What problem does this PR solve?

Issue Number: close #54915

Problem Summary:

What changed and how does it work?

as title

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

Signed-off-by: lance6716 <lance6716@gmail.com>

tiprow · 2024-07-25T11:28:32Z

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.

Signed-off-by: lance6716 <lance6716@gmail.com>

lance6716 · 2024-07-25T11:32:58Z

/check-issue-triage-complete

codecov · 2024-07-25T11:54:28Z

Codecov Report

Attention: Patch coverage is 0% with 64 lines in your changes missing coverage. Please review.

Project coverage is 74.2361%. Comparing base (0ad2ca6) to head (4f3f474).

Additional details and impacted files

@@               Coverage Diff                @@
##             master     #54914        +/-   ##
================================================
+ Coverage   72.8022%   74.2361%   +1.4338%     
================================================
  Files          1561       1561                
  Lines        438809     438898        +89     
================================================
+ Hits         319463     325821      +6358     
+ Misses        99641      93224      -6417     
- Partials      19705      19853       +148

Flag	Coverage Δ
integration	`47.4271% <0.0000%> (?)`

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

Components	Coverage Δ
dumpling	`52.9567% <ø> (ø)`
parser	`∅ <ø> (∅)`
br	`46.3045% <ø> (+0.4145%)`	⬆️

D3Hunter · 2024-07-31T03:18:07Z

pkg/executor/recover_test.go

+	tk.MustExec("set @@global.tidb_ddl_error_count_limit = 2")
+	tk.MustExec("set @@global.tidb_enable_fast_create_table=ON")
+
+	for i := 0; i < 400; i++ {


you can create them in parallel to be faster, as in https://github.com/pingcap/tidb/pull/55025/files#diff-3c769a746cec11d5c583a7ad47b92b8a90a1b8d8e3cb86a7f368de7deb5f71b9R660-R661

D3Hunter · 2024-07-31T03:20:57Z

pkg/executor/recover_test.go

+		tk.MustExec(fmt.Sprintf("create database db_%d", i))
+	}
+
+	ts, _ := tk.Session().GetStore().GetOracle().GetTimestamp(context.Background(), &oracle.Option{})


Suggested change

ts, _ := tk.Session().GetStore().GetOracle().GetTimestamp(context.Background(), &oracle.Option{})

ts, _ := store.CurrentVersion(oracle.GlobalTxnScope)

D3Hunter · 2024-07-31T03:32:46Z

pkg/executor/recover_test.go

+	}
+
+	ts, _ := tk.Session().GetStore().GetOracle().GetTimestamp(context.Background(), &oracle.Option{})
+	flashbackTs := oracle.GetTimeFromTS(ts)


this ts is after all database created, so flashback cluster does nothing?

In the old behaviour this test will fail (stuck) because KV entry exceed limitation. I can add a comment in next commit

D3Hunter · 2024-07-31T03:48:31Z

pkg/ddl/cluster.go

+//
+// Precondition: schemaKeyRanges is sorted by start key. schemaKeyRanges are
+// non-overlapping.
+func appendContinuousKeyRanges(result []kv.KeyRange, schemaKeyRanges []keyRangeMayExclude) []kv.KeyRange {


Suggested change

func appendContinuousKeyRanges(result []kv.KeyRange, schemaKeyRanges []keyRangeMayExclude) []kv.KeyRange {

func mergeContinuousKeyRanges(result []kv.KeyRange, schemaKeyRanges []keyRangeMayExclude) []kv.KeyRange {

I want to mention the input slice will be appended, so I prefer keep the old name

maybe avoid modifying input param, ok to leave it anyway

ti-chi-bot · 2024-07-31T04:02:22Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: D3Hunter, wjhuang2016

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,wjhuang2016]
~~pkg/ddl/OWNERS~~ [wjhuang2016]

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-07-31T04:02:25Z

[LGTM Timeline notifier]

Timeline:

2024-07-29 07:26:21.00205574 +0000 UTC m=+167897.282103830: ☑️ agreed by wjhuang2016.
2024-07-31 04:02:24.957464184 +0000 UTC m=+328461.237512252: ☑️ agreed by D3Hunter.

lance6716 · 2024-07-31T04:03:20Z

/hold

tiprow · 2024-07-31T04:11:29Z

@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	`454714b`	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.

Signed-off-by: lance6716 <lance6716@gmail.com>

lance6716 · 2024-07-31T04:15:13Z

/unhold

lance6716 · 2024-07-31T04:54:08Z

/retest

tiprow · 2024-07-31T04:54:37Z

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

…ap#54914) close pingcap#54915

ddl: merge continuous key ranges in FLASHBACK CLUSTER job args

068cf85

Signed-off-by: lance6716 <lance6716@gmail.com>

lance6716 mentioned this pull request Jul 25, 2024

FLASHBACK CLUSTER may enter deadloop if too many databases #54915

Closed

Merge branch 'master' of github.com:pingcap/tidb into flashback-cluster

454714b

Signed-off-by: lance6716 <lance6716@gmail.com>

ti-chi-bot bot added do-not-merge/needs-triage-completed and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. do-not-merge/needs-linked-issue do-not-merge/needs-tests-checked labels Jul 25, 2024

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

wjhuang2016 approved these changes Jul 29, 2024

View reviewed changes

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

D3Hunter reviewed Jul 31, 2024

View reviewed changes

D3Hunter approved these changes Jul 31, 2024

View reviewed changes

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

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 31, 2024

lance6716 added 2 commits July 31, 2024 12:14

improve UT

a879c22

Signed-off-by: lance6716 <lance6716@gmail.com>

Merge branch 'master' of github.com:pingcap/tidb into flashback-cluster

4f3f474

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 31, 2024

ti-chi-bot bot merged commit e494895 into pingcap:master Jul 31, 2024
21 checks passed

hawkingrei pushed a commit to hawkingrei/tidb that referenced this pull request Aug 1, 2024

ddl: merge continuous key ranges in FLASHBACK CLUSTER job args (pingc…

0f5139a

…ap#54914) close pingcap#54915

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ddl: merge continuous key ranges in FLASHBACK CLUSTER job args #54914

ddl: merge continuous key ranges in FLASHBACK CLUSTER job args #54914

lance6716 commented Jul 25, 2024 •

edited

Loading

tiprow bot commented Jul 25, 2024

lance6716 commented Jul 25, 2024

codecov bot commented Jul 25, 2024 •

edited

Loading

D3Hunter Jul 31, 2024

D3Hunter Jul 31, 2024

D3Hunter Jul 31, 2024

lance6716 Jul 31, 2024

D3Hunter Jul 31, 2024

lance6716 Jul 31, 2024

D3Hunter Jul 31, 2024

ti-chi-bot bot commented Jul 31, 2024

ti-chi-bot bot commented Jul 31, 2024

lance6716 commented Jul 31, 2024

tiprow bot commented Jul 31, 2024

lance6716 commented Jul 31, 2024

lance6716 commented Jul 31, 2024

tiprow bot commented Jul 31, 2024

	ts, _ := tk.Session().GetStore().GetOracle().GetTimestamp(context.Background(), &oracle.Option{})
	ts, _ := store.CurrentVersion(oracle.GlobalTxnScope)

	func appendContinuousKeyRanges(result []kv.KeyRange, schemaKeyRanges []keyRangeMayExclude) []kv.KeyRange {
	func mergeContinuousKeyRanges(result []kv.KeyRange, schemaKeyRanges []keyRangeMayExclude) []kv.KeyRange {

ddl: merge continuous key ranges in FLASHBACK CLUSTER job args #54914

ddl: merge continuous key ranges in FLASHBACK CLUSTER job args #54914

Conversation

lance6716 commented Jul 25, 2024 • edited Loading

What problem does this PR solve?

What changed and how does it work?

Check List

Release note

tiprow bot commented Jul 25, 2024

lance6716 commented Jul 25, 2024

codecov bot commented Jul 25, 2024 • edited Loading

Codecov Report

D3Hunter Jul 31, 2024

Choose a reason for hiding this comment

D3Hunter Jul 31, 2024

Choose a reason for hiding this comment

D3Hunter Jul 31, 2024

Choose a reason for hiding this comment

lance6716 Jul 31, 2024

Choose a reason for hiding this comment

D3Hunter Jul 31, 2024

Choose a reason for hiding this comment

lance6716 Jul 31, 2024

Choose a reason for hiding this comment

D3Hunter Jul 31, 2024

Choose a reason for hiding this comment

ti-chi-bot bot commented Jul 31, 2024

ti-chi-bot bot commented Jul 31, 2024

[LGTM Timeline notifier]

lance6716 commented Jul 31, 2024

tiprow bot commented Jul 31, 2024

lance6716 commented Jul 31, 2024

lance6716 commented Jul 31, 2024

tiprow bot commented Jul 31, 2024

lance6716 commented Jul 25, 2024 •

edited

Loading

codecov bot commented Jul 25, 2024 •

edited

Loading