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

Fix deadlock in Consul RTT.

Browse Source 
- consul/rtt.go:388: s.getDatacentersByDistance().  Acquires RLock()
- consul/rtt.go:341: sortDatacentersByDistance() RLock still held.
- consul/rtt.go:282: getDatacenterDistance() RLock still held.
- consul/rtt.go:268: getNodesForDatacenter(). Attempts to reacquire RLock(), hangs indefinitely.
This commit is contained in:
Sean Chittenden 2016-06-20 14:59:54 -07:00
parent af30e17dcd
commit c3e54b79fd
No known key found for this signature in database
GPG Key ID: 4EBC9DC16C2E5E16
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)