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

etcd_worker: fix missed watch events caused by progress notifications #3848

Merged
merged 9 commits into from
Dec 14, 2021
Merged

etcd_worker: fix missed watch events caused by progress notifications #3848

merged 9 commits into from
Dec 14, 2021

Conversation

liuzix
Copy link
Contributor

@liuzix liuzix commented Dec 13, 2021 •
edited
Loading

What problem does this PR solve?

Close #3750 #3815

What is changed and how it works?

  • Do not use progress notifications to update the maintained watermark of the Etcd watch stream.

Check List

Tests

  • Unit test
  • Integration test

Related changes

  • Need to cherry-pick to the release branch

Release note 

Fix a bug in EtcdWorker that could hang the owner or processor.

@liuzix liuzix added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 13, 2021
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Dec 13, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • asddongmen
  • overvenus

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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Dec 13, 2021
@liuzix
Copy link
Contributor Author

liuzix commented Dec 13, 2021

/run-integration-tests

@liuzix
Copy link
Contributor Author

liuzix commented Dec 13, 2021

/run-integration-tests

@liuzix
Copy link
Contributor Author

liuzix commented Dec 13, 2021

/run-leak-tests

@liuzix liuzix linked an issue Dec 13, 2021 that may be closed by this pull request
new_ci_collation_with_old_value_test flakes due to etcd worker fails to commit #3815
Closed
@liuzix liuzix added status/ptal Could you please take a look? area/ticdc Issues or PRs related to TiCDC. labels Dec 13, 2021
@liuzix liuzix added needs-cherry-pick-release-4.0 Should cherry pick this PR to release-4.0 branch. needs-cherry-pick-release-5.1 Should cherry pick this PR to release-5.1 branch. needs-cherry-pick-release-5.0 Should cherry pick this PR to release-5.0 branch. needs-cherry-pick-release-5.2 Should cherry pick this PR to release-5.2 branch. needs-cherry-pick-release-5.3 Should cherry pick this PR to release-5.3 branch. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Dec 13, 2021
@liuzix
Copy link
Contributor Author

liuzix commented Dec 13, 2021

/run-integration-tests

@liuzix
Copy link
Contributor Author

liuzix commented Dec 13, 2021

/run-integration-tests

@liuzix
Copy link
Contributor Author

liuzix commented Dec 13, 2021

/run-verify

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Dec 13, 2021
overvenus
overvenus approved these changes Dec 13, 2021
View reviewed changes
Copy link
Member

@overvenus overvenus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ti-chi-bot ti-chi-bot removed the status/LGT1 Indicates that a PR has LGTM 1. label Dec 13, 2021
@asddongmen
Copy link
Contributor

/run-leak-tests
/run-verify

@liuzix
Copy link
Contributor Author

liuzix commented Dec 13, 2021

/run-all-tests

@ti-chi-bot
Copy link
Member

@liuzix: 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.

@ti-chi-bot ti-chi-bot merged commit 06547d9 into pingcap:master Dec 14, 2021
ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request Dec 14, 2021
@liuzix @ti-chi-bot
This is an automated cherry-pick of pingcap#3848
2ad3f33 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request Dec 14, 2021
Closed
@ti-chi-bot
Copy link
Member

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

ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request Dec 14, 2021
@liuzix @ti-chi-bot
This is an automated cherry-pick of pingcap#3848
06f0869 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request Dec 14, 2021
Closed
@ti-chi-bot
Copy link
Member

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

ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request Dec 14, 2021
@liuzix @ti-chi-bot
This is an automated cherry-pick of pingcap#3848
2d801cb 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request Dec 14, 2021
Closed
@ti-chi-bot
Copy link
Member

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

ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request Dec 14, 2021
@liuzix @ti-chi-bot
This is an automated cherry-pick of pingcap#3848
8a32dc4 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request Dec 14, 2021
Closed
@ti-chi-bot
Copy link
Member

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

ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request Dec 14, 2021
@liuzix @ti-chi-bot
This is an automated cherry-pick of pingcap#3848
8ee1b82 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request Dec 14, 2021
Closed
@ti-chi-bot
Copy link
Member

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

asddongmen pushed a commit to ti-chi-bot/tiflow that referenced this pull request Dec 15, 2021
@liuzix @asddongmen
etcd_worker: fix missed watch events caused by progress notifications (…
729e15b 
…pingcap#3848)

(cherry picked from commit 06547d9)
@asddongmen asddongmen mentioned this pull request Dec 15, 2021
Merged
asddongmen pushed a commit to ti-chi-bot/tiflow that referenced this pull request Dec 20, 2021
@liuzix @asddongmen
etcd_worker: fix missed watch events caused by progress notifications (…
a1ad891 
…pingcap#3848)

(cherry picked from commit 06547d9)
@asddongmen asddongmen mentioned this pull request Dec 20, 2021
Merged
asddongmen pushed a commit to ti-chi-bot/tiflow that referenced this pull request Dec 20, 2021
@liuzix @asddongmen
etcd_worker: fix missed watch events caused by progress notifications (…
7f6507b 
…pingcap#3848)

(cherry picked from commit 06547d9)
asddongmen pushed a commit to ti-chi-bot/tiflow that referenced this pull request Dec 20, 2021
@liuzix @asddongmen
etcd_worker: fix missed watch events caused by progress notifications (…
f38f2cf 
…pingcap#3848)

(cherry picked from commit 06547d9)
zhaoxinyu pushed a commit to zhaoxinyu/ticdc that referenced this pull request Dec 29, 2021
@liuzix @zhaoxinyu
etcd_worker: fix missed watch events caused by progress notifications (…
879e488 
…pingcap#3848)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@asddongmen asddongmen asddongmen approved these changes

@overvenus overvenus overvenus approved these changes

Assignees
No one assigned
Labels
area/ticdc Issues or PRs related to TiCDC. 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. needs-cherry-pick-release-5.3 Should cherry pick this PR to release-5.3 branch. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 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?
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

new_ci_collation_with_old_value_test flakes due to etcd worker fails to commit TestEtcdBank is unstable
4 participants
@liuzix @ti-chi-bot @overvenus @asddongmen