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.

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

changefeed: Fix cannot remove changefeed when err gcttl exceeded (#2429) #2455

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #2429

What problem does this PR solve?

fix #2391

What is changed and how it works?

  • make changefeed resource can be release before check if meet gcTTL error
  • add a GcManager interface, which can be used to create a mocked GcManager to help write unit-test
  • fix some typo and lint problems when walking the code.

Check List

Tests

  • No code

Code changes

Side effects

Related changes

  • Need to cherry-pick to the release branch

Release note

 fix the bug that changefeed cannot be removed if meet GcTTL Exceeded Error

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@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 release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/cherry-pick-not-approved component/scheduler TiCDC inner scheduler component. size/L Denotes a PR that changes 100-499 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-4.0 This PR is cherry-picked to release-4.0 from a source PR. labels Aug 3, 2021
@amyangfei amyangfei added this to the v4.0.15 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

Please resolve conflicts @3AceShowHand

@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: 28d1eac

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

/run-integration-tests
/run-kafka-tests

@codecov-commenter
Copy link

Codecov Report

Merging #2455 (28d1eac) into release-4.0 (753073a) will increase coverage by 1.4094%.
The diff coverage is 57.6557%.

@@                 Coverage Diff                 @@
##           release-4.0      #2455        +/-   ##
===================================================
+ Coverage      53.7661%   55.1756%   +1.4094%     
===================================================
  Files              153        164        +11     
  Lines            15958      19505      +3547     
===================================================
+ Hits              8580      10762      +2182     
- Misses            6475       7727      +1252     
- Partials           903       1016       +113     

@ti-chi-bot ti-chi-bot merged commit d2a3f69 into pingcap:release-4.0 Aug 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. component/scheduler TiCDC inner scheduler component. release-note Denotes a PR that will be considered when it comes time to generate release notes. 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. type/bugfix This PR fixes a bug. type/cherry-pick-for-release-4.0 This PR is cherry-picked to release-4.0 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants