restore: rewrite auto increment id after pitr #46521

3pointer · 2023-08-30T09:10:41Z

What problem does this PR solve?

Issue Number: close #46520

Problem Summary:

After we seperate auto_increment and tidb_rowid. pitr didn't handle the tidb_rowid correctly. This PR fixed it. and add a new restriction about TableVersionInfo. When model.CurrLatestTableInfoVersion updated. backup and restore need to check carefully about compatibility.

What is changed and how it works?

Check List

Tests

Unit test
Integration test
Manual test (add detailed scripts or steps below)
the same steps as description is issue.
and check the result.

backup cluster:

restore cluster:

No code

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.

Fix the issue that pitr will lost auto-increment id allocator update after table rewrite during restore

ti-chi-bot · 2023-08-30T09:10:43Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

tiprow · 2023-08-30T09:11:11Z

Hi @3pointer. 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/test-infra repository.

Leavrth · 2023-08-30T09:22:44Z

meta/meta.go

@@ -316,6 +316,26 @@ func (*Meta) autoIncrementIDKey(tableID int64) []byte {
 	return []byte(fmt.Sprintf("%s:%d", mIncIDPrefix, tableID))


call the AutoIncrementIDKey instead.

codecov · 2023-08-30T09:56:27Z

Codecov Report

Merging #46521 (34ef3f1) into master (be5ce3d) will decrease coverage by 0.5979%.
Report is 3 commits behind head on master.
The diff coverage is 24.2424%.

Additional details and impacted files

@@               Coverage Diff                @@
##             master     #46521        +/-   ##
================================================
- Coverage   73.3443%   72.7465%   -0.5979%     
================================================
  Files          1310       1331        +21     
  Lines        394945     401912      +6967     
================================================
+ Hits         289670     292377      +2707     
- Misses        86842      91053      +4211     
- Partials      18433      18482        +49

Flag	Coverage Δ
integration	`25.4390% <6.0606%> (?)`
unit	`73.4334% <24.2424%> (+0.0890%)`	⬆️

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

Components	Coverage Δ
dumpling	`54.0444% <ø> (ø)`
parser	`84.9628% <ø> (+0.0108%)`	⬆️
br	`48.0180% <0.0000%> (-4.3104%)`	⬇️

ti-chi-bot · 2023-08-31T08:01:17Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Leavrth, tiancaiamao

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~~ [Leavrth,tiancaiamao]

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 · 2023-08-31T08:01:21Z

[LGTM Timeline notifier]

Timeline:

2023-08-30 09:23:14.880472203 +0000 UTC m=+1918959.429488190: ☑️ agreed by Leavrth.
2023-08-31 08:01:20.588499419 +0000 UTC m=+2000445.137515403: ☑️ agreed by tiancaiamao.

3pointer · 2023-09-01T06:20:15Z

/test mysql-test

tiprow · 2023-09-01T06:20:47Z

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

In response to this:

/test mysql-test

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/test-infra repository.

3pointer · 2023-09-01T07:34:37Z

/test unit-test

…nto rewrite_auto_inc

hawkingrei · 2023-09-04T01:10:17Z

/test all

3pointer · 2023-09-04T02:15:31Z

/retest

tiprow · 2023-09-04T02:16:03Z

@3pointer: 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/test-infra repository.

3pointer · 2023-09-04T02:34:30Z

/ok-to-test

3pointer · 2023-09-04T03:14:54Z

/test unit-test

tiprow · 2023-09-04T03:15:28Z

@3pointer: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test tiprow_fast_test

Use /test all to run all jobs.

In response to this:

/test unit-test

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/test-infra repository.

3pointer · 2023-09-04T05:04:57Z

/test unit-test

tiprow · 2023-09-04T05:05:34Z

@3pointer: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test tiprow_fast_test

Use /test all to run all jobs.

In response to this:

/test unit-test

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/test-infra repository.

3pointer · 2023-09-04T05:21:21Z

/ok-to-test

3pointer · 2023-09-04T05:35:21Z

/test check-dev2

tiprow · 2023-09-04T05:35:55Z

@3pointer: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test tiprow_fast_test

Use /test all to run all jobs.

In response to this:

/test check-dev2

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/test-infra repository.

3pointer · 2023-09-04T05:40:37Z

/test check-dev2

3pointer · 2023-09-04T05:41:05Z

/run-check_dev_2

tiprow · 2023-09-04T05:41:10Z

@3pointer: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test tiprow_fast_test

Use /test all to run all jobs.

In response to this:

/test check-dev2

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/test-infra repository.

3pointer · 2023-09-04T06:46:15Z

/run-check_dev_2

3pointer · 2023-09-04T08:06:06Z

/test tiprow_fast_test

ti-chi-bot · 2023-09-04T08:06:10Z

@3pointer: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test build
/test canary-scan-security
/test check-dev
/test check-dev2
/test mysql-test
/test pingcap/tidb/canary_ghpr_unit_test
/test pull-br-integration-test
/test pull-common-test
/test pull-e2e-test
/test pull-integration-common-test
/test pull-integration-copr-test
/test pull-integration-ddl-test
/test pull-integration-jdbc-test
/test pull-integration-mysql-test
/test pull-integration-prisma-test
/test pull-mysql-connector-test
/test pull-sqllogic-test
/test pull-tiflash-test
/test unit-test

The following commands are available to trigger optional jobs:

/test pull-notify-when-compatibility-sections-changed

Use /test all to run the following jobs that were automatically triggered:

pingcap/tidb/ghpr_build
pingcap/tidb/ghpr_check
pingcap/tidb/ghpr_check2
pingcap/tidb/ghpr_mysql_test
pingcap/tidb/ghpr_unit_test

In response to this:

/test tiprow_fast_test

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/test-infra repository.

ti-chi-bot · 2023-09-04T11:07:29Z

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

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

ti-chi-bot · 2023-09-04T11:08:14Z

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

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

close #46520

3pointer added 2 commits August 30, 2023 15:44

pitr: support auto increment id with TableInfoVersion5

7579c9a

add test

56ac367

3pointer marked this pull request as ready for review August 30, 2023 09:12

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 Aug 30, 2023

3pointer changed the title ~~restore: rewrite auto increment id after~~ restore: rewrite auto increment id after pitr Aug 30, 2023

fix bazel

8a18bc6

Leavrth approved these changes Aug 30, 2023

View reviewed changes

ti-chi-bot bot added approved needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Aug 30, 2023

3pointer added 2 commits August 30, 2023 17:23

address comment

77093f7

fix bazel build

5472519

update bazel

424d828

tiancaiamao approved these changes Aug 31, 2023

View reviewed changes

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

ti-chi-bot bot added needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. and removed do-not-merge/needs-triage-completed labels Sep 1, 2023

3pointer added 2 commits September 1, 2023 16:57

Merge branch 'master' into rewrite_auto_inc

f4725d9

Merge branch 'rewrite_auto_inc' of https://github.com/3pointer/tidb i…

a314592

…nto rewrite_auto_inc

ti-chi-bot bot added the ok-to-test Indicates a PR is ready to be tested. label Sep 4, 2023

Merge branch 'master' into rewrite_auto_inc

34ef3f1

ti-chi-bot bot merged commit e82519e into pingcap:master Sep 4, 2023
8 of 12 checks passed

ti-chi-bot mentioned this pull request Sep 4, 2023

restore: rewrite auto increment id after pitr (#46521) #46634

Merged

12 tasks

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Sep 4, 2023

This is an automated cherry-pick of pingcap#46521

2fed7db

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

ti-chi-bot mentioned this pull request Sep 4, 2023

restore: rewrite auto increment id after pitr (#46521) #46635

Merged

12 tasks

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Sep 4, 2023

This is an automated cherry-pick of pingcap#46521

41e0803

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

ti-chi-bot bot pushed a commit that referenced this pull request Sep 4, 2023

restore: rewrite auto increment id after pitr (#46521) (#46634)

7c75786

close #46520

ti-chi-bot bot pushed a commit that referenced this pull request Sep 4, 2023

restore: rewrite auto increment id after pitr (#46521) (#46635)

3652a93

close #46520

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

restore: rewrite auto increment id after pitr #46521

restore: rewrite auto increment id after pitr #46521

3pointer commented Aug 30, 2023 •

edited

Loading

ti-chi-bot bot commented Aug 30, 2023

tiprow bot commented Aug 30, 2023

Leavrth Aug 30, 2023

codecov bot commented Aug 30, 2023 •

edited

Loading

ti-chi-bot bot commented Aug 31, 2023

ti-chi-bot bot commented Aug 31, 2023

3pointer commented Sep 1, 2023

tiprow bot commented Sep 1, 2023

3pointer commented Sep 1, 2023

hawkingrei commented Sep 4, 2023

3pointer commented Sep 4, 2023

tiprow bot commented Sep 4, 2023

3pointer commented Sep 4, 2023

3pointer commented Sep 4, 2023

tiprow bot commented Sep 4, 2023

3pointer commented Sep 4, 2023

tiprow bot commented Sep 4, 2023

3pointer commented Sep 4, 2023

3pointer commented Sep 4, 2023

tiprow bot commented Sep 4, 2023

3pointer commented Sep 4, 2023

3pointer commented Sep 4, 2023

tiprow bot commented Sep 4, 2023

3pointer commented Sep 4, 2023

3pointer commented Sep 4, 2023

ti-chi-bot bot commented Sep 4, 2023

ti-chi-bot commented Sep 4, 2023

ti-chi-bot commented Sep 4, 2023

		@@ -316,6 +316,26 @@ func (*Meta) autoIncrementIDKey(tableID int64) []byte {
		return []byte(fmt.Sprintf("%s:%d", mIncIDPrefix, tableID))

restore: rewrite auto increment id after pitr #46521

restore: rewrite auto increment id after pitr #46521

Conversation

3pointer commented Aug 30, 2023 • edited Loading

What problem does this PR solve?

What is changed and how it works?

Check List

Release note

ti-chi-bot bot commented Aug 30, 2023

tiprow bot commented Aug 30, 2023

Leavrth Aug 30, 2023

Choose a reason for hiding this comment

codecov bot commented Aug 30, 2023 • edited Loading

Codecov Report

ti-chi-bot bot commented Aug 31, 2023

ti-chi-bot bot commented Aug 31, 2023

[LGTM Timeline notifier]

3pointer commented Sep 1, 2023

tiprow bot commented Sep 1, 2023

3pointer commented Sep 1, 2023

hawkingrei commented Sep 4, 2023

3pointer commented Sep 4, 2023

tiprow bot commented Sep 4, 2023

3pointer commented Sep 4, 2023

3pointer commented Sep 4, 2023

tiprow bot commented Sep 4, 2023

3pointer commented Sep 4, 2023

tiprow bot commented Sep 4, 2023

3pointer commented Sep 4, 2023

3pointer commented Sep 4, 2023

tiprow bot commented Sep 4, 2023

3pointer commented Sep 4, 2023

3pointer commented Sep 4, 2023

tiprow bot commented Sep 4, 2023

3pointer commented Sep 4, 2023

3pointer commented Sep 4, 2023

ti-chi-bot bot commented Sep 4, 2023

ti-chi-bot commented Sep 4, 2023

ti-chi-bot commented Sep 4, 2023

3pointer commented Aug 30, 2023 •

edited

Loading

codecov bot commented Aug 30, 2023 •

edited

Loading