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

proxy/grpcproxy: wait until register before Serve

Browse Source 
It was fatal-ing with:

grpclog.Fatalf("grpc: Server.RegisterService after Server.Serve for %q", sd.ServiceName)

Signed-off-by: Gyu-Ho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyu-Ho Lee 2017-11-16 09:17:17 -08:00
parent a8c84ffc93
commit 91335d01bb
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
proxy/grpcproxy/cluster_test.go
View File

@ -107,15 +107,20 @@ func newClusterProxyServer(endpoints []string, t *testing.T) *clusterproxyTestSe
}
var opts []grpc.ServerOption
cts.server = grpc.NewServer(opts...)
go cts.server.Serve(cts.l)
// wait some time for free port 0 to be resolved
time.Sleep(500 * time.Millisecond)
servec := make(chan struct{})
go func() {
<-servec
cts.server.Serve(cts.l)
}()
Register(client, "test-prefix", cts.l.Addr().String(), 7)
cts.cp, cts.donec = NewClusterProxy(client, cts.l.Addr().String(), "test-prefix")
cts.caddr = cts.l.Addr().String()
pb.RegisterClusterServer(cts.server, cts.cp)
close(servec)
// wait some time for free port 0 to be resolved
time.Sleep(500 * time.Millisecond)
return cts
}