Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ddl: Check the ResolvedTS during the preparation. #37607

Merged
merged 8 commits into from
Sep 6, 2022
Merged

ddl: Check the ResolvedTS during the preparation. #37607

merged 8 commits into from
Sep 6, 2022

Conversation

HuSharp
Copy link
Contributor

@HuSharp HuSharp commented Sep 5, 2022 •
edited
Loading

Signed-off-by: husharp jinhao.hu@pingcap.com

What problem does this PR solve?

Issue Number: ref #37197

Problem Summary:

What is changed and how it works?

Check the ResolvedTS during the preparation to make sure the flashback version is not greater than it.

Check List

Tests

  • Unit test

Release note

None

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Sep 5, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • Defined2014
  • JmPotato

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added do-not-merge/invalid-title release-note-none Denotes a PR that doesn't merit a release note. labels Sep 5, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Sep 5, 2022 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@ti-chi-bot ti-chi-bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Sep 5, 2022
@HuSharp HuSharp changed the title Check the ResolvedTS during the preparation. Cluster.go: Check the ResolvedTS during the preparation. Sep 5, 2022
@HuSharp HuSharp changed the title Cluster.go: Check the ResolvedTS during the preparation. ddl: Check the ResolvedTS during the preparation. Sep 5, 2022
@HuSharp
Check the ResolvedTS during the preparation to make sure the flashbac…
412d24a 
…k version is not greater than it.

Signed-off-by: husharp <jinhao.hu@pingcap.com>
@HuSharp HuSharp force-pushed the check_ResolvedTS_in_flashback branch from 09c3abd to 412d24a Compare September 5, 2022 03:49
JmPotato
JmPotato reviewed Sep 5, 2022
View reviewed changes
@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Sep 5, 2022
@HuSharp
inject safe ts test
fed2624 
Signed-off-by: husharp <jinhao.hu@pingcap.com>
@HuSharp HuSharp force-pushed the check_ResolvedTS_in_flashback branch from db016ec to fed2624 Compare September 5, 2022 10:07
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Sep 5, 2022
JmPotato
JmPotato reviewed Sep 5, 2022
View reviewed changes
JmPotato
JmPotato reviewed Sep 5, 2022
View reviewed changes
Copy link
Member

@JmPotato JmPotato left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The reset LGTM. PTAL @Defined2014 @bb7133

Defined2014 and others added 4 commits September 5, 2022 21:25
@Defined2014
Merge branch 'master' into check_ResolvedTS_in_flashback
cd4cafb
@HuSharp
Check the ResolvedTS during the preparation to make sure the flashbac…
d951e6a 
…k version is not greater than it.

Signed-off-by: husharp <jinhao.hu@pingcap.com>
@HuSharp
inject safe ts test
f17d9a0 
Signed-off-by: husharp <jinhao.hu@pingcap.com>
@HuSharp
modify test name
4d06cd7 
Signed-off-by: husharp <jinhao.hu@pingcap.com>
@HuSharp HuSharp force-pushed the check_ResolvedTS_in_flashback branch from cd4cafb to 4d06cd7 Compare September 6, 2022 00:41
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Sep 6, 2022
@Defined2014
Copy link
Contributor

LGTM, Need fix some UTs, like TestFlashbackCloseAndResetPDSchedule and TestCancelFlashbackCluster

@HuSharp
add failpoint for cluster_test.go
e6c7ccc 
Signed-off-by: husharp <jinhao.hu@pingcap.com>
@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 6, 2022
@HuSharp
Copy link
Contributor Author

HuSharp commented Sep 6, 2022

Fixed tests that include flashback cluster as of timestamp in the cluster_test.go and recover_test.go files. PTAL @Defined2014 @JmPotato @bb7133

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Sep 6, 2022
@Defined2014
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: e6c7ccc

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 6, 2022
@JmPotato
Copy link
Member

JmPotato commented Sep 6, 2022

/rebuild

@ti-chi-bot ti-chi-bot merged commit 4a88efc into pingcap:master Sep 6, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Sep 6, 2022

TiDB MergeCI notify

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci/integration-cdc-test 🟢 all 37 tests passed 24 min Existing passed
idc-jenkins-ci-tidb/integration-common-test 🟢 all 17 tests passed 16 min Existing passed
idc-jenkins-ci-tidb/common-test 🟢 all 11 tests passed 12 min Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 8 min 5 sec Existing passed
idc-jenkins-ci-tidb/integration-ddl-test 🟢 all 6 tests passed 5 min 25 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 5 min 4 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 4 min 24 sec Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 3 min 22 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 2 min 44 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

@JmPotato JmPotato mentioned this pull request Sep 20, 2022
Closed
@HuSharp HuSharp deleted the check_ResolvedTS_in_flashback branch November 9, 2022 08:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JmPotato JmPotato JmPotato approved these changes

@Defined2014 Defined2014 Defined2014 approved these changes

Assignees
No one assigned
Labels
release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@HuSharp @ti-chi-bot @sre-bot @Defined2014 @JmPotato