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

Avoid racing in closing Etcd.errc channel #19205

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −3
Open

Avoid racing in closing Etcd.errc channel #19205

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: 4 additions & 3 deletions server/embed/etcd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,9 +872,6 @@
}

func (e *Etcd) errHandler(err error) {
e.wg.Add(1)
defer e.wg.Done()

if err != nil {
e.GetLogger().Error("setting up serving from embedded etcd failed.", zap.Error(err))
}
Expand All @@ -883,6 +880,10 @@
return
default:
}

e.wg.Add(1)
defer e.wg.Done()

Check warning on line 885 in server/embed/etcd.go

View check run for this annotation

Codecov / codecov/patch

server/embed/etcd.go#L884-L885 

Added lines #L884 - L885 were not covered by tests

select {
case <-e.stopc:
case e.errc <- err:
Expand Down
Loading