status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3728 from weiwei04/fix_globalRPC_goroutine_leak 

fix globalRPC goroutine leak
This commit is contained in:
James Phillips 2017-12-14 17:54:19 -08:00 committed by GitHub
parent 674d9234bb cc9648c957
commit 06f980061e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
agent/consul/rpc.go
View File

@ -307,11 +307,13 @@ func (s *Server) forwardDC(method, dc string, args interface{}, reply interface{
func (s *Server) globalRPC(method string, args interface{}, func (s *Server) globalRPC(method string, args interface{},
reply structs.CompoundResponse) error { reply structs.CompoundResponse) error {
errorCh := make(chan error)
respCh := make(chan interface{})
// Make a new request into each datacenter // Make a new request into each datacenter
dcs := s.router.GetDatacenters() dcs := s.router.GetDatacenters()
replies, total := 0, len(dcs)
errorCh := make(chan error, total)
respCh := make(chan interface{}, total)
for _, dc := range dcs { for _, dc := range dcs {
go func(dc string) { go func(dc string) {
rr := reply.New() rr := reply.New()
@ -323,7 +325,6 @@ func (s *Server) globalRPC(method string, args interface{},
}(dc) }(dc)
} }
replies, total := 0, len(dcs)
for replies < total { for replies < total {
select { select {
case err := <-errorCh: case err := <-errorCh: