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

Merged
merged 6 commits into from
Aug 23, 2021
Merged

owner: fix schema snapshot read from TiKV #2604

merged 6 commits into from
Aug 23, 2021

Conversation

liuzix
Copy link
Contributor

@liuzix liuzix commented Aug 23, 2021 •
edited by overvenus
Loading

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.

@liuzix liuzix added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 23, 2021
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 23, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • amyangfei
  • asddongmen

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 release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Aug 23, 2021
@liuzix
Copy link
Contributor Author

liuzix commented Aug 23, 2021

/run-integration-tests

@ti-chi-bot ti-chi-bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Aug 23, 2021
@liuzix
Copy link
Contributor Author

liuzix commented Aug 23, 2021

/run-integration-tests

@liuzix
Copy link
Contributor Author

liuzix commented Aug 23, 2021

/run-integration-tests

@liuzix
Copy link
Contributor Author

liuzix commented Aug 23, 2021

/run-integration-tests

2 similar comments
@liuzix
Copy link
Contributor Author

liuzix commented Aug 23, 2021

/run-integration-tests

@liuzix
Copy link
Contributor Author

liuzix commented Aug 23, 2021

/run-integration-tests

@amyangfei amyangfei added needs-cherry-pick-release-4.0 Should cherry pick this PR to release-4.0 branch. needs-cherry-pick-release-5.0 Should cherry pick this PR to release-5.0 branch. needs-cherry-pick-release-5.1 Should cherry pick this PR to release-5.1 branch. needs-cherry-pick-release-5.2 Should cherry pick this PR to release-5.2 branch. labels Aug 23, 2021
@amyangfei amyangfei added this to the v5.2.0 milestone Aug 23, 2021
@amyangfei amyangfei added release-blocker This issue blocks a release. Please solve it ASAP. type/bugfix This PR fixes a bug. labels Aug 23, 2021
@liuzix
Copy link
Contributor Author

liuzix commented Aug 23, 2021

/run-integration-tests

@ti-chi-bot ti-chi-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Aug 23, 2021
@liuzix
Copy link
Contributor Author

liuzix commented Aug 23, 2021

/run-integration-tests

@codecov-commenter
Copy link

codecov-commenter commented Aug 23, 2021 •
edited
Loading

Codecov Report

Merging #2604 (cb918a9) into master (f3fdd65) will increase coverage by 5.1270%.
The diff coverage is 68.9024%.

@@               Coverage Diff                @@
##             master      #2604        +/-   ##
================================================
+ Coverage   56.0786%   61.2056%   +5.1270%     
================================================
  Files           169        161         -8     
  Lines         20605      17915      -2690     
================================================
- Hits          11555      10965       -590     
+ Misses         7919       5953      -1966     
+ Partials       1131        997       -134

@liuzix liuzix added the status/ptal Could you please take a look? label Aug 23, 2021
@liuzix
Copy link
Contributor Author

liuzix commented Aug 23, 2021

/run-integration-tests

@liuzix
Copy link
Contributor Author

liuzix commented Aug 23, 2021

/run-unit-tests

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 23, 2021
@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 Aug 23, 2021
@liuzix
Copy link
Contributor Author

liuzix commented Aug 23, 2021

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: b37220c

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

/run-integration-tests

2 similar comments
@liuzix
Copy link
Contributor Author

liuzix commented Aug 23, 2021

/run-integration-tests

@liuzix
Copy link
Contributor Author

liuzix commented Aug 23, 2021

/run-integration-tests

@ti-chi-bot ti-chi-bot merged commit 1ddc1e9 into pingcap:master Aug 23, 2021
@ti-chi-bot ti-chi-bot mentioned this pull request Aug 23, 2021
Merged
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #2607.

@ti-chi-bot ti-chi-bot mentioned this pull request Aug 23, 2021
Merged
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #2608.

@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #2609.

@ti-chi-bot ti-chi-bot mentioned this pull request Aug 23, 2021
Merged
ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request Aug 23, 2021
@liuzix @ti-chi-bot
This is an automated cherry-pick of pingcap#2604
7302189 
Signed-off-by: ti-chi-bot <[email protected]>
@ti-chi-bot ti-chi-bot mentioned this pull request Aug 23, 2021
Merged
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #2610.

@nongfushanquan nongfushanquan added the cherry-pick-approved Cherry pick PR approved by release team. label Aug 23, 2021
ti-chi-bot added a commit that referenced this pull request Aug 23, 2021
@ti-chi-bot
owner: fix schema snapshot read from TiKV (#2604) (#2608)
692c242
ti-chi-bot added a commit that referenced this pull request Aug 24, 2021
@ti-chi-bot
owner: fix schema snapshot read from TiKV (#2604) (#2607)
844ba0a
ti-chi-bot added a commit that referenced this pull request Sep 7, 2021
@ti-chi-bot
owner: fix schema snapshot read from TiKV (#2604) (#2609)
982e4f3
ti-chi-bot added a commit that referenced this pull request Dec 15, 2021
@ti-chi-bot
owner: fix schema snapshot read from TiKV (#2604) (#2610)
ae5f006
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nongfushanquan nongfushanquan nongfushanquan left review comments

@asddongmen asddongmen asddongmen approved these changes

@amyangfei amyangfei amyangfei approved these changes

@overvenus overvenus Awaiting requested review from overvenus

Assignees
No one assigned
Labels
cherry-pick-approved Cherry pick PR approved by release team. component/replica-model Replication model component. needs-cherry-pick-release-4.0 Should cherry pick this PR to release-4.0 branch. needs-cherry-pick-release-5.0 Should cherry pick this PR to release-5.0 branch. needs-cherry-pick-release-5.1 Should cherry pick this PR to release-5.1 branch. needs-cherry-pick-release-5.2 Should cherry pick this PR to release-5.2 branch. release-blocker This issue blocks a release. Please solve it ASAP. 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. status/ptal Could you please take a look? type/bugfix This PR fixes a bug.
Projects
None yet
Milestone
v5.2.0
Development

Successfully merging this pull request may close these issues.

DDL handling fails when changefeed starts at FinishTs of a schema change
6 participants
@liuzix @ti-chi-bot @codecov-commenter @amyangfei @asddongmen @nongfushanquan