From 7e72e74dae435f78c1591bb52c7330a37f3dc924 Mon Sep 17 00:00:00 2001 From: Benjamin Wang Date: Sun, 19 Jan 2025 09:59:01 +0000 Subject: [PATCH] partially rollback 19139: no need to wait when closing errc Signed-off-by: Benjamin Wang --- server/embed/etcd.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/server/embed/etcd.go b/server/embed/etcd.go index f5fa2c2c692..d39528bf8e8 100644 --- a/server/embed/etcd.go +++ b/server/embed/etcd.go @@ -84,7 +84,6 @@ type Etcd struct { errc chan error closeOnce sync.Once - wg sync.WaitGroup } type peerListener struct { @@ -457,7 +456,6 @@ func (e *Etcd) Close() { } } if e.errc != nil { - e.wg.Wait() close(e.errc) } } @@ -872,9 +870,6 @@ func (e *Etcd) serveMetrics() (err error) { } 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)) }