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

owner: fix schema snapshot read from TiKV (#2604) #2610

Merged
merged 20 commits into from
Dec 15, 2021
Merged

owner: fix schema snapshot read from TiKV (#2604) #2610

merged 20 commits into from
Dec 15, 2021

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #2604

What problem does this PR solve?

Close #2603

What is changed and how it works?

  • Fixed the timestamp with which to read TiKV snapshot for schema.
  • Improved integration test case ddl_reentrant so that similar bugs will not be reintroduced in the future.

Check List

Tests

  • Integration test

Related changes

  • Need to cherry-pick to the release branch

Release note 

Fixed a bug in DDL handling when the owner restarts.

@ti-chi-bot
Copy link
Member Author

[REVIEW NOTIFICATION]

This pull request has not been approved.

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/cherry-pick-not-approved release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Aug 23, 2021
@ti-chi-bot ti-chi-bot mentioned this pull request Aug 23, 2021
Merged
@ti-chi-bot ti-chi-bot added component/replica-model Replication model component. release-blocker This issue blocks a release. Please solve it ASAP. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. status/LGT2 Indicates that a PR has LGTM 2. type/bugfix This PR fixes a bug. type/cherry-pick-for-release-5.0 This PR is cherry-picked to release-5.0 from a source PR. labels Aug 23, 2021
@ti-chi-bot ti-chi-bot requested review from asddongmen and lonng August 23, 2021 10:20
@nongfushanquan nongfushanquan added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Aug 23, 2021
@amyangfei amyangfei added this to the v5.0.4 milestone Aug 23, 2021
@amyangfei
Copy link
Contributor

/run-integration-tests

@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 24, 2021
@amyangfei
Copy link
Contributor

/run-integration-tests

5 similar comments
@amyangfei
Copy link
Contributor

/run-integration-tests

@amyangfei
Copy link
Contributor

/run-integration-tests

@amyangfei
Copy link
Contributor

/run-integration-tests

@asddongmen
Copy link
Contributor

/run-integration-tests

@amyangfei
Copy link
Contributor

/run-integration-tests

@amyangfei amyangfei mentioned this pull request Aug 27, 2021
Merged
@amyangfei amyangfei force-pushed the cherry-pick-2604-to-release-5.0 branch from 59a16d5 to 699963f Compare August 30, 2021 07:44
@amyangfei amyangfei added this to the v5.0.5 milestone Sep 23, 2021
@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 24, 2021
@overvenus overvenus mentioned this pull request Oct 11, 2021
Merged
@ti-chi-bot ti-chi-bot mentioned this pull request Oct 11, 2021
Merged
@amyangfei amyangfei removed the release-blocker This issue blocks a release. Please solve it ASAP. label Oct 20, 2021
@amyangfei amyangfei modified the milestones: v5.0.5, v5.0.6 Dec 8, 2021
@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed status/can-merge Indicates a PR has been approved by a committer. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Dec 15, 2021
@ti-chi-bot ti-chi-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 15, 2021
@liuzix
Copy link
Contributor

liuzix commented Dec 15, 2021

/merge

@ti-chi-bot
Copy link
Member Author

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

Commit hash: 4091893

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 15, 2021
@liuzix
Copy link
Contributor

liuzix commented Dec 15, 2021

/run-integration-tests

@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Dec 15, 2021
@liuzix
Copy link
Contributor

liuzix commented Dec 15, 2021

/merge

@ti-chi-bot
Copy link
Member Author

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

Commit hash: 46ffd17

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 15, 2021
@ti-chi-bot ti-chi-bot merged commit ae5f006 into pingcap:release-5.0 Dec 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@amyangfei amyangfei amyangfei left review comments

@asddongmen asddongmen Awaiting requested review from asddongmen

@lonng lonng Awaiting requested review from lonng

Assignees

@liuzix liuzix

Labels
cherry-pick-approved Cherry pick PR approved by release team. component/replica-model Replication model component. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 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. type/bugfix This PR fixes a bug. type/cherry-pick-for-release-5.0 This PR is cherry-picked to release-5.0 from a source PR.
Projects
None yet
Milestone
v5.0.6
Development

Successfully merging this pull request may close these issues.
7 participants
@ti-chi-bot @amyangfei @asddongmen @overvenus @liuzix @Rustin170506 @nongfushanquan