kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-08 19:35:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

goling(1) compliance pass (e.g. Rpc* -> RPC)

Browse Source
This commit is contained in:
Sean Chittenden
2016-06-10 23:26:15 -04:00
parent 6819f2b68d
commit 5331ea7bc6
8 changed files with 85 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
client/rpcproxy/rpcproxy.go
View File

@@ -63,8 +63,8 @@ const (
// configuration to prevents a cyclic import dependency.
type NomadConfigInfo interface {
Datacenter() string
RpcMajorVersion() int
RpcMinorVersion() int
RPCMajorVersion() int
RPCMinorVersion() int
Region() string
}
@@ -468,7 +468,7 @@ func (p *RPCProxy) RebalanceServers() {
// detect the failed node.
selectedServer := l.L[0]
ok, err := p.connPoolPinger.PingNomadServer(p.configInfo.Region(), p.configInfo.RpcMajorVersion(), selectedServer)
ok, err := p.connPoolPinger.PingNomadServer(p.configInfo.Region(), p.configInfo.RPCMajorVersion(), selectedServer)
if ok {
foundHealthyServer = true
break
@@ -697,23 +697,23 @@ func (p *RPCProxy) RefreshServerLists(servers []*structs.NodeServerInfo, numNode
// TODO(sean@): Move the logging throttle logic into a
// dedicated logging package so RPCProxy does not have to
// perform this accounting.
if int32(p.configInfo.RpcMajorVersion()) < s.RpcMajorVersion ||
(int32(p.configInfo.RpcMajorVersion()) == s.RpcMajorVersion &&
int32(p.configInfo.RpcMinorVersion()) < s.RpcMinorVersion) {
if int32(p.configInfo.RPCMajorVersion()) < s.RPCMajorVersion ||
(int32(p.configInfo.RPCMajorVersion()) == s.RPCMajorVersion &&
int32(p.configInfo.RPCMinorVersion()) < s.RPCMinorVersion) {
now := time.Now()
t, ok := p.rpcAPIMismatchThrottle[s.RpcAdvertiseAddr]
t, ok := p.rpcAPIMismatchThrottle[s.RPCAdvertiseAddr]
if ok && t.After(now) {
continue
}
p.logger.Printf("[WARN] client.rpcproxy: API mismatch between client version (v%d.%d) and server version (v%d.%d), ignoring server %q", p.configInfo.RpcMajorVersion(), p.configInfo.RpcMinorVersion(), s.RpcMajorVersion, s.RpcMinorVersion, s.RpcAdvertiseAddr)
p.rpcAPIMismatchThrottle[s.RpcAdvertiseAddr] = now.Add(rpcAPIMismatchLogRate)
p.logger.Printf("[WARN] client.rpcproxy: API mismatch between client version (v%d.%d) and server version (v%d.%d), ignoring server %q", p.configInfo.RPCMajorVersion(), p.configInfo.RPCMinorVersion(), s.RPCMajorVersion, s.RPCMinorVersion, s.RPCAdvertiseAddr)
p.rpcAPIMismatchThrottle[s.RPCAdvertiseAddr] = now.Add(rpcAPIMismatchLogRate)
continue
}
server, err := NewServerEndpoint(s.RpcAdvertiseAddr)
server, err := NewServerEndpoint(s.RPCAdvertiseAddr)
if err != nil {
p.logger.Printf("[WARN] client.rpcproxy: Unable to create a server from %q: %v", s.RpcAdvertiseAddr, err)
p.logger.Printf("[WARN] client.rpcproxy: Unable to create a server from %q: %v", s.RPCAdvertiseAddr, err)
continue
}

6
client/rpcproxy/rpcproxy_test.go
View File

@@ -82,11 +82,11 @@ func (s *fauxSerf) Datacenter() string {
return s.datacenter
}
func (s *fauxSerf) RpcMajorVersion() int {
func (s *fauxSerf) RPCMajorVersion() int {
return s.rpcMajorVersion
}
func (s *fauxSerf) RpcMinorVersion() int {
func (s *fauxSerf) RPCMinorVersion() int {
return s.rpcMinorVersion
}
@@ -645,7 +645,7 @@ func test_reconcileServerList(maxServers int) (bool, error) {
// failPct of the servers for the reconcile. This
// allows for the selected server to no longer be
// healthy for the reconcile below.
if ok, _ := p.connPoolPinger.PingNomadServer(p.configInfo.Region(), p.configInfo.RpcMajorVersion(), node); ok {
if ok, _ := p.connPoolPinger.PingNomadServer(p.configInfo.Region(), p.configInfo.RPCMajorVersion(), node); ok {
// Will still be present
healthyServers = append(healthyServers, node)
} else {