diff --git a/client/client.go b/client/client.go index e3cf1055d..f16a29562 100644 --- a/client/client.go +++ b/client/client.go @@ -1661,7 +1661,7 @@ func (c *Client) updateNodeStatus() error { c.logger.Warn("ignoring invalid server", "error", err, "server", s.RPCAdvertiseAddr) continue } - e := &servers.Server{DC: s.Datacenter, Addr: addr} + e := &servers.Server{Addr: addr} nomadServers = append(nomadServers, e) } if len(nomadServers) == 0 { diff --git a/client/servers/manager.go b/client/servers/manager.go index fbec774b2..246133daa 100644 --- a/client/servers/manager.go +++ b/client/servers/manager.go @@ -48,9 +48,6 @@ type Server struct { Addr net.Addr addr string sync.Mutex - - // DC is the datacenter of the server - DC string } func (s *Server) Copy() *Server { @@ -60,7 +57,6 @@ func (s *Server) Copy() *Server { return &Server{ Addr: s.Addr, addr: s.addr, - DC: s.DC, } } @@ -82,7 +78,7 @@ func (s *Server) Equal(o *Server) bool { return false } - return s.Addr.String() == o.Addr.String() && s.DC == o.DC + return s.Addr.String() == o.Addr.String() } type Servers []*Server @@ -119,12 +115,7 @@ func (s Servers) shuffle() { func (s Servers) Sort() { sort.Slice(s, func(i, j int) bool { - a, b := s[i], s[j] - if addr1, addr2 := a.Addr.String(), b.Addr.String(); addr1 == addr2 { - return a.DC < b.DC - } else { - return addr1 < addr2 - } + return s[i].String() < s[j].String() }) }