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) #3756

Merged
merged 17 commits into from
Dec 20, 2021
Merged

etcd_worker: add timeout for etcd txn and watchCh (#3667) #3756

merged 17 commits into from
Dec 20, 2021

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #3667

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 @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
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 labels Dec 7, 2021
@ti-chi-bot ti-chi-bot mentioned this pull request Dec 7, 2021
Merged
@ti-chi-bot ti-chi-bot added component/replica-model Replication model 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 Dec 7, 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 7, 2021
@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Dec 10, 2021
@asddongmen
Copy link
Contributor

/run-integration-tests

@asddongmen
Copy link
Contributor

/run-integration-tests

@asddongmen
Copy link
Contributor

/run-all-tests

@asddongmen
Copy link
Contributor

asddongmen commented Dec 13, 2021 •
edited
Loading

/run-integration-tests

（pass）

@asddongmen
Copy link
Contributor

/run-integration-tests

@codecov-commenter
Copy link

codecov-commenter commented Dec 13, 2021 •
edited
Loading

Codecov Report

Merging #3756 (472f94a) into release-4.0 (753073a) will increase coverage by 3.3435%.
The diff coverage is 66.4823%.

@@                 Coverage Diff                 @@
##           release-4.0      #3756        +/-   ##
===================================================
+ Coverage      53.7661%   57.1097%   +3.3435%     
===================================================
  Files              153        170        +17     
  Lines            15958      19832      +3874     
===================================================
+ Hits              8580      11326      +2746     
- Misses            6475       7444       +969     
- Partials           903       1062       +159

@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 13, 2021
@asddongmen
Copy link
Contributor

/run-integration-tests

@nongfushanquan nongfushanquan added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Dec 13, 2021
@asddongmen asddongmen added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 13, 2021
@asddongmen
Copy link
Contributor

/run-integration-tests

@purelind
Copy link
Collaborator

/run-all-tests

@purelind
Copy link
Collaborator

/run-integration-tests

1 similar comment
@purelind
Copy link
Collaborator

/run-integration-tests

@asddongmen
Copy link
Contributor

/run-integration-tests

@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: 2c9a23b

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 20, 2021
@asddongmen asddongmen removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 20, 2021
@asddongmen
Copy link
Contributor

/run-all-tests

@asddongmen
Copy link
Contributor

/run-integration-tests

@ti-chi-bot ti-chi-bot merged commit 15e2f7d into pingcap:release-4.0 Dec 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@asddongmen asddongmen

Labels
cherry-pick-approved Cherry pick PR approved by release team. component/replica-model Replication model component. release-note Denotes a PR that will be considered when it comes time to generate release notes. 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/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
Milestone
No milestone
Development

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