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: add timeout for etcd txn and watchCh #3667

Merged
merged 36 commits into from
Dec 7, 2021
Merged

etcd_worker: add timeout for etcd txn and watchCh #3667

merged 36 commits into from
Dec 7, 2021

Conversation

asddongmen
Copy link
Contributor

@asddongmen asddongmen commented Nov 30, 2021 •
edited
Loading

What problem does this PR solve?

#3615

What is changed and how it works?

Check List

Tests

  • Unit test.

Code changes

Side effects

Related changes

  • Need to cherry-pick to the release branch

Release note 

Try to fix owner stuck caused by etcd txn timeout or etcd watch channel blocked in EtcdWorker.

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

ti-chi-bot commented Nov 30, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • liuzix
  • 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/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Nov 30, 2021
@asddongmen
Copy link
Contributor Author

/run-integration-tests

@asddongmen asddongmen added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 30, 2021
@codecov-commenter
Copy link

Codecov Report

Merging #3667 (7d14ac5) into master (24030f8) will increase coverage by 1.5674%.
The diff coverage is 68.1107%.

@@               Coverage Diff                @@
##             master      #3667        +/-   ##
================================================
+ Coverage   56.5356%   58.1031%   +1.5674%     
================================================
  Files           211        247        +36     
  Lines         22798      24651      +1853     
================================================
+ Hits          12889      14323      +1434     
- Misses         8598       8894       +296     
- Partials       1311       1434       +123

@asddongmen asddongmen added component/replica-model Replication model component. and removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Nov 30, 2021
@liuzix
Copy link
Contributor

liuzix commented Nov 30, 2021

/run-integration-tests

overvenus
overvenus reviewed Nov 30, 2021
View reviewed changes
pkg/orchestrator/etcd_worker.go Outdated Show resolved Hide resolved
pkg/orchestrator/etcd_worker.go Outdated Show resolved Hide resolved
pkg/orchestrator/etcd_worker.go Outdated Show resolved Hide resolved
liuzix
liuzix reviewed Nov 30, 2021
View reviewed changes
pkg/orchestrator/etcd_worker.go Outdated Show resolved Hide resolved
pkg/orchestrator/etcd_worker.go Outdated Show resolved Hide resolved
pkg/orchestrator/etcd_worker.go Outdated Show resolved Hide resolved
pkg/orchestrator/etcd_worker.go Outdated Show resolved Hide resolved
pkg/orchestrator/etcd_worker.go Outdated Show resolved Hide resolved
pkg/orchestrator/batch.go Outdated Show resolved Hide resolved
pkg/orchestrator/batch.go Outdated Show resolved Hide resolved
@asddongmen
Copy link
Contributor Author

/run-integration-tests

@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Nov 30, 2021
@asddongmen
Copy link
Contributor Author

/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. needs-cherry-pick-release-5.3 Should cherry pick this PR to release-5.3 branch. labels Dec 7, 2021
ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request Dec 7, 2021
@asddongmen @ti-chi-bot
This is an automated cherry-pick of pingcap#3667
bf9ca11 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request Dec 7, 2021
@asddongmen @ti-chi-bot
This is an automated cherry-pick of pingcap#3667
d2465bb 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request Dec 7, 2021
Merged
@ti-chi-bot
Copy link
Member

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

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

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

ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request Dec 7, 2021
@asddongmen @ti-chi-bot
This is an automated cherry-pick of pingcap#3667
cc64eca 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
This was referenced Dec 7, 2021
Closed
Closed
@ti-chi-bot
Copy link
Member

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

@ti-chi-bot
Copy link
Member

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

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

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

@overvenus overvenus mentioned this pull request Dec 7, 2021
Closed
okJiang pushed a commit to okJiang/tiflow that referenced this pull request Dec 8, 2021
@asddongmen @okJiang
etcd_worker: add timeout for etcd txn and watchCh (pingcap#3667)
7a5f991
liuzix added a commit that referenced this pull request Dec 10, 2021
@liuzix
Revert "etcd_worker: add timeout for etcd txn and watchCh (#3667)"
ca4e474 
This reverts commit 60479c8.
asddongmen added a commit to ti-chi-bot/tiflow that referenced this pull request Dec 15, 2021
@asddongmen
This is an automated cherry-pick of pingcap#3667
1743a90 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@asddongmen asddongmen mentioned this pull request Dec 15, 2021
Merged
asddongmen added a commit to ti-chi-bot/tiflow that referenced this pull request Dec 20, 2021
@asddongmen
This is an automated cherry-pick of pingcap#3667
6c86144 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@asddongmen asddongmen mentioned this pull request Dec 20, 2021
Merged
asddongmen added a commit to ti-chi-bot/tiflow that referenced this pull request Dec 20, 2021
@asddongmen
This is an automated cherry-pick of pingcap#3667
6a0c207 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot added a commit that referenced this pull request Dec 20, 2021
@ti-chi-bot
etcd_worker: add timeout for etcd txn and watchCh (#3667) (#3756)
15e2f7d
@asddongmen asddongmen deleted the fix_pd_cause_owner_stuck branch December 22, 2021 08:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@amyangfei amyangfei amyangfei approved these changes

@overvenus overvenus overvenus approved these changes

@liuzix liuzix liuzix approved these changes

@3AceShowHand 3AceShowHand Awaiting requested review from 3AceShowHand

@Rustin170506 Rustin170506 Awaiting requested review from Rustin170506

@sdojjy sdojjy Awaiting requested review from sdojjy

Assignees
No one assigned
Labels
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. 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/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. status/ptal Could you please take a look? type/bugfix This PR fixes a bug.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@asddongmen @ti-chi-bot @codecov-commenter @liuzix @ben1009 @amyangfei @overvenus