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

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

Merged
merged 1 commit into from
Dec 13, 2024
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions server/embed/serve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

import (
"context"
"errors"
"fmt"
"io"
defaultLog "log"
Expand Down Expand Up @@ -102,6 +103,12 @@
logger := defaultLog.New(io.Discard, "etcdhttp", 0)
<-s.ReadyNotify()

select {
case <-s.StoppingNotify():
return errors.New("server is stopping")

Check warning on line 108 in server/embed/serve.go

View check run for this annotation

Codecov / codecov/patch

server/embed/serve.go#L107-L108 

Added lines #L107 - L108 were not covered by tests
case <-s.ReadyNotify():
}

sctx.lg.Info("ready to serve client requests")

m := cmux.New(sctx.l)
Expand Down
Loading