Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12797 from lzhfromustc/3_23

Browse Source 
server/etcdmain and tests: Fix goroutine leaks
This commit is contained in:
Piotr Tabor 2021-05-10 08:29:17 +02:00 committed by GitHub
commit f5717016cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/etcdmain/grpc_proxy.go
View File

@ -218,7 +218,7 @@ func startGRPCProxy(cmd *cobra.Command, args []string) {
httpClient := mustNewHTTPClient(lg) httpClient := mustNewHTTPClient(lg)
srvhttp, httpl := mustHTTPListener(lg, m, tlsinfo, client, proxyClient) srvhttp, httpl := mustHTTPListener(lg, m, tlsinfo, client, proxyClient)
errc := make(chan error) errc := make(chan error, 3)
go func() { errc <- newGRPCProxyServer(lg, client).Serve(grpcl) }() go func() { errc <- newGRPCProxyServer(lg, client).Serve(grpcl) }()
go func() { errc <- srvhttp.Serve(httpl) }() go func() { errc <- srvhttp.Serve(httpl) }()
go func() { errc <- m.Serve() }() go func() { errc <- m.Serve() }()

2
tests/integration/snapshot/v3_snapshot_test.go
View File

@ -258,7 +258,7 @@ func restoreCluster(t *testing.T, clusterN int, dbPath string) (
cfgs[i] = cfg cfgs[i] = cfg
} }
sch := make(chan *embed.Etcd) sch := make(chan *embed.Etcd, len(cfgs))
for i := range cfgs { for i := range cfgs {
go func(idx int) { go func(idx int) {
srv, err := embed.StartEtcd(cfgs[idx]) srv, err := embed.StartEtcd(cfgs[idx])