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

etcd/client (ticdc): Prevent revision in WatchWitchChan fallback. (#3851) #3926

Merged

Conversation

ti-chi-bot
Copy link
Member

@ti-chi-bot ti-chi-bot commented Dec 16, 2021

This is an automated cherry-pick of #3851

What problem does this PR solve?

ref: #3615
ref: #4549

Prevent revision rollback.

Note: Before this PR merge, the lastRevision in WatchWitchChan is initialized to 0. When the watchCh is reset since there has no message been received , revision will be set to 0+1.
This may result in receiving some messages that do not need to be received, lead to a certain extend of performance loss, but it will not cause any correctness problems.

What is changed and how it works?

Clear and simple in code.

Check List

Tests

  • Unit test

Related changes

  • Need to cherry-pick to the release branch

Release note

None

@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-none Denotes a PR that doesn't merit a release note. labels Dec 16, 2021
@ti-chi-bot ti-chi-bot added area/ticdc Issues or PRs related to TiCDC. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. status/LGT2 Indicates that a PR has LGTM 2. type/cherry-pick-for-release-5.2 This PR is cherry-picked to release-5.2 from a source PR. type/enhancement The issue or PR belongs to an enhancement. labels Dec 16, 2021
@ti-chi-bot ti-chi-bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 16, 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 Dec 21, 2021
@overvenus overvenus added this to the v5.2.4 milestone Jan 6, 2022
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Feb 23, 2022
@ti-chi-bot ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 6, 2022
@asddongmen
Copy link
Contributor

/run-all-tests

@codecov-commenter
Copy link

Codecov Report

❗ No coverage uploaded for pull request base (release-5.2@d593b56). Click here to learn what that means.
The diff coverage is n/a.

@@               Coverage Diff                @@
##             release-5.2      #3926   +/-   ##
================================================
  Coverage               ?   57.3773%           
================================================
  Files                  ?        194           
  Lines                  ?      19431           
  Branches               ?          0           
================================================
  Hits                   ?      11149           
  Misses                 ?       7314           
  Partials               ?        968           

@asddongmen
Copy link
Contributor

/run-integration-tests

@asddongmen
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

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

Commit hash: 0ce7ad9

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

@ti-chi-bot: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@asddongmen
Copy link
Contributor

/run-kafka-integration-tests

@ti-chi-bot ti-chi-bot merged commit 9820578 into pingcap:release-5.2 Apr 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/ticdc Issues or PRs related to TiCDC. cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. size/XL Denotes a PR that changes 500-999 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/cherry-pick-for-release-5.2 This PR is cherry-picked to release-5.2 from a source PR. type/enhancement The issue or PR belongs to an enhancement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants