status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-02-17 08:07:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2130 from hashicorp/b-fix-rtt-deadlock

Browse Source 
Fix deadlock in Consul RTT.
This commit is contained in:
James Phillips 2016-06-21 09:55:04 -07:00 committed by GitHub
commit a173349a67
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
consul/rtt.go
View File

@ -386,12 +386,11 @@ func getDatacenterMaps(s serfer, dcs []string) []structs.DatacenterMap {
// other things being equal (or if coordinates are disabled). // other things being equal (or if coordinates are disabled).
func (s *Server) getDatacentersByDistance() ([]string, error) { func (s *Server) getDatacentersByDistance() ([]string, error) {
s.remoteLock.RLock() s.remoteLock.RLock()
defer s.remoteLock.RUnlock() dcs := make([]string, 0, len(s.remoteConsuls))
var dcs []string
for dc := range s.remoteConsuls { for dc := range s.remoteConsuls {
dcs = append(dcs, dc) dcs = append(dcs, dc)
} }
s.remoteLock.RUnlock()
// Sort by name first, since the coordinate sort is stable. // Sort by name first, since the coordinate sort is stable.
sort.Strings(dcs) sort.Strings(dcs)