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

Do not wait for ready notify if the server is stopping #19041

Merged
merged 1 commit into from
Dec 13, 2024

Conversation

ahrtr
Copy link
Member

@ahrtr ahrtr commented Dec 11, 2024

Extracted from #19040, so as to be reviewed & merged separately.

When server is stopping for whatever reason, the member may fail to publish itself. In that case, it won't close the ready notify channel, accordingly the etcdserver will get blocked on the ready notification (see below).

<-s.ReadyNotify()

Copy link

codecov bot commented Dec 11, 2024

Codecov Report

Attention: Patch coverage is 50.00000% with 2 lines in your changes missing coverage. Please review.

Project coverage is 68.78%. Comparing base (2cf7172) to head (93b01af).
Report is 2 commits behind head on main.

Files with missing lines Patch % Lines
server/embed/serve.go 50.00% 2 Missing ⚠️
Additional details and impacted files
Files with missing lines Coverage Δ
server/embed/serve.go 57.34% <50.00%> (-0.11%) ⬇️

... and 20 files with indirect coverage changes

@@            Coverage Diff             @@
##             main   #19041      +/-   ##
==========================================
- Coverage   68.78%   68.78%   -0.01%     
==========================================
  Files         420      420              
  Lines       35623    35627       +4     
==========================================
+ Hits        24504    24505       +1     
- Misses       9691     9699       +8     
+ Partials     1428     1423       -5     

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2cf7172...93b01af. Read the comment docs.

@k8s-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ahrtr, serathius

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ahrtr ahrtr merged commit 50e97f8 into etcd-io:main Dec 13, 2024
35 checks passed
@ahrtr
Copy link
Member Author

ahrtr commented Dec 13, 2024

/cherry-pick release-3.5

@k8s-infra-cherrypick-robot

@ahrtr: new pull request created: #19056

In response to this:

/cherry-pick release-3.5

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 kubernetes-sigs/prow repository.

@ahrtr
Copy link
Member Author

ahrtr commented Dec 13, 2024

/cherry-pick release-3.4

@k8s-infra-cherrypick-robot

@ahrtr: #19041 failed to apply on top of branch "release-3.4":

Applying: Do not wait for ready notify if the server is stopping
Using index info to reconstruct a base tree...
A	server/embed/serve.go
Falling back to patching base and 3-way merge...
Auto-merging embed/serve.go
CONFLICT (content): Merge conflict in embed/serve.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Do not wait for ready notify if the server is stopping

In response to this:

/cherry-pick release-3.4

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 kubernetes-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

4 participants