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: ignore duplicated DDL job in ddl puller (#2423) #2459

Merged
merged 2 commits into from
Aug 4, 2021
Merged

owner: ignore duplicated DDL job in ddl puller (#2423) #2459

merged 2 commits into from
Aug 4, 2021

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #2423

What problem does this PR solve?

Fix #2422

What is changed and how it works?

Since the output of ddl puller is sorted, but can be duplicated, we add a lastDDLJobID to filter out duplicated DDL job.

Check List

Tests

  • Unit test
  • Integration test

Release note 

Fix a bug that owner could meet ErrSchemaStorageTableMiss error and reset a changefeed by accident.

@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 3, 2021
@ti-chi-bot ti-chi-bot mentioned this pull request Aug 3, 2021
Merged
@ti-chi-bot ti-chi-bot added 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.1 This PR is cherry-picked to release-5.1 from a source PR. labels Aug 3, 2021
@amyangfei amyangfei added this to the v5.1.2 milestone Aug 4, 2021
@nongfushanquan nongfushanquan added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Aug 4, 2021
@amyangfei
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

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

Commit hash: 6d2dbf1

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

/run-integration-tests

@ti-chi-bot ti-chi-bot merged commit 09b438c into pingcap:release-5.1 Aug 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@amyangfei amyangfei Awaiting requested review from amyangfei

@zier-one zier-one Awaiting requested review from zier-one

Assignees

@amyangfei amyangfei

Labels
cherry-pick-approved Cherry pick PR approved by release team. 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.1 This PR is cherry-picked to release-5.1 from a source PR.
Projects
None yet
Milestone
v5.1.2
Development

Successfully merging this pull request may close these issues.
3 participants
@ti-chi-bot @amyangfei @nongfushanquan