Merge pull request etcd-io#12797 from lzhfromustc/3_23

server/etcdmain and tests: Fix goroutine leaks
ptabor · May 10, 2021 · f571701 · f571701
2 parents aeb9b5f + 3de6b38
commit f571701
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/server/etcdmain/grpc_proxy.go b/server/etcdmain/grpc_proxy.go
@@ -218,7 +218,7 @@ func startGRPCProxy(cmd *cobra.Command, args []string) {
 	httpClient := mustNewHTTPClient(lg)
 
 	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 <- srvhttp.Serve(httpl) }()
 	go func() { errc <- m.Serve() }()

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