kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-06 10:25:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5731 from hashicorp/b-ignore-dc

Browse Source 
client: drop unused DC field from servers list
This commit is contained in:
Michael Schurter
2019-05-22 08:42:15 -07:00
committed by GitHub
parent fb38029ba9 edd972519f
commit a52c7c2cbf
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/client.go
View File

@@ -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 {

13
client/servers/manager.go
View File

@@ -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()
})
}