kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-05 01:45:44 +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

82
command/agent/agent.go
View File

@@ -33,12 +33,12 @@ type Agent struct {
consulSyncer *consul.Syncer
client *client.Client
clientHttpAddr string
clientRpcAddr string
clientHTTPAddr string
clientRPCAddr string
server *nomad.Server
serverHttpAddr string
serverRpcAddr string
serverHTTPAddr string
serverRPCAddr string
serverSerfAddr string
shutdown bool
@@ -174,35 +174,35 @@ func (a *Agent) serverConfig() (*nomad.Config, error) {
// Resolve the Server's HTTP Address
if a.config.AdvertiseAddrs.HTTP != "" {
a.serverHttpAddr = a.config.AdvertiseAddrs.HTTP
a.serverHTTPAddr = a.config.AdvertiseAddrs.HTTP
} else if a.config.Addresses.HTTP != "" {
a.serverHttpAddr = fmt.Sprintf("%v:%v", a.config.Addresses.HTTP, a.config.Ports.HTTP)
a.serverHTTPAddr = fmt.Sprintf("%v:%v", a.config.Addresses.HTTP, a.config.Ports.HTTP)
} else if a.config.BindAddr != "" {
a.serverHttpAddr = fmt.Sprintf("%v:%v", a.config.BindAddr, a.config.Ports.HTTP)
a.serverHTTPAddr = fmt.Sprintf("%v:%v", a.config.BindAddr, a.config.Ports.HTTP)
} else {
a.serverHttpAddr = fmt.Sprintf("%v:%v", "127.0.0.1", a.config.Ports.HTTP)
a.serverHTTPAddr = fmt.Sprintf("%v:%v", "127.0.0.1", a.config.Ports.HTTP)
}
addr, err := net.ResolveTCPAddr("tcp", a.serverHttpAddr)
addr, err := net.ResolveTCPAddr("tcp", a.serverHTTPAddr)
if err != nil {
return nil, fmt.Errorf("error resolving HTTP addr %q: %v:", a.serverHttpAddr, err)
return nil, fmt.Errorf("error resolving HTTP addr %q: %v", a.serverHTTPAddr, err)
}
a.serverHttpAddr = fmt.Sprintf("%s:%d", addr.IP.String(), addr.Port)
a.serverHTTPAddr = fmt.Sprintf("%s:%d", addr.IP.String(), addr.Port)
// Resolve the Server's RPC Address
if a.config.AdvertiseAddrs.RPC != "" {
a.serverRpcAddr = a.config.AdvertiseAddrs.RPC
a.serverRPCAddr = a.config.AdvertiseAddrs.RPC
} else if a.config.Addresses.RPC != "" {
a.serverRpcAddr = fmt.Sprintf("%v:%v", a.config.Addresses.RPC, a.config.Ports.RPC)
a.serverRPCAddr = fmt.Sprintf("%v:%v", a.config.Addresses.RPC, a.config.Ports.RPC)
} else if a.config.BindAddr != "" {
a.serverRpcAddr = fmt.Sprintf("%v:%v", a.config.BindAddr, a.config.Ports.RPC)
a.serverRPCAddr = fmt.Sprintf("%v:%v", a.config.BindAddr, a.config.Ports.RPC)
} else {
a.serverRpcAddr = fmt.Sprintf("%v:%v", "127.0.0.1", a.config.Ports.RPC)
a.serverRPCAddr = fmt.Sprintf("%v:%v", "127.0.0.1", a.config.Ports.RPC)
}
addr, err = net.ResolveTCPAddr("tcp", a.serverRpcAddr)
addr, err = net.ResolveTCPAddr("tcp", a.serverRPCAddr)
if err != nil {
return nil, fmt.Errorf("error resolving RPC addr %q: %v:", a.serverRpcAddr, err)
return nil, fmt.Errorf("error resolving RPC addr %q: %v", a.serverRPCAddr, err)
}
a.serverRpcAddr = fmt.Sprintf("%s:%d", addr.IP.String(), addr.Port)
a.serverRPCAddr = fmt.Sprintf("%s:%d", addr.IP.String(), addr.Port)
// Resolve the Server's Serf Address
if a.config.AdvertiseAddrs.Serf != "" {
@@ -216,7 +216,7 @@ func (a *Agent) serverConfig() (*nomad.Config, error) {
}
addr, err = net.ResolveTCPAddr("tcp", a.serverSerfAddr)
if err != nil {
return nil, fmt.Errorf("error resolving Serf addr %q: %v:", a.serverSerfAddr, err)
return nil, fmt.Errorf("error resolving Serf addr %q: %v", a.serverSerfAddr, err)
}
a.serverSerfAddr = fmt.Sprintf("%s:%d", addr.IP.String(), addr.Port)
@@ -292,37 +292,37 @@ func (a *Agent) clientConfig() (*clientconfig.Config, error) {
// Resolve the Client's HTTP address
if a.config.AdvertiseAddrs.HTTP != "" {
a.clientHttpAddr = a.config.AdvertiseAddrs.HTTP
a.clientHTTPAddr = a.config.AdvertiseAddrs.HTTP
} else if a.config.Addresses.HTTP != "" {
a.clientHttpAddr = fmt.Sprintf("%v:%v", a.config.Addresses.HTTP, a.config.Ports.HTTP)
a.clientHTTPAddr = fmt.Sprintf("%v:%v", a.config.Addresses.HTTP, a.config.Ports.HTTP)
} else if a.config.BindAddr != "" {
a.clientHttpAddr = fmt.Sprintf("%v:%v", a.config.BindAddr, a.config.Ports.HTTP)
a.clientHTTPAddr = fmt.Sprintf("%v:%v", a.config.BindAddr, a.config.Ports.HTTP)
} else {
a.clientHttpAddr = fmt.Sprintf("%v:%v", "127.0.0.1", a.config.Ports.HTTP)
a.clientHTTPAddr = fmt.Sprintf("%v:%v", "127.0.0.1", a.config.Ports.HTTP)
}
addr, err := net.ResolveTCPAddr("tcp", a.clientHttpAddr)
addr, err := net.ResolveTCPAddr("tcp", a.clientHTTPAddr)
if err != nil {
return nil, fmt.Errorf("error resolving HTTP addr %q: %v:", a.clientHttpAddr, err)
return nil, fmt.Errorf("error resolving HTTP addr %q: %v", a.clientHTTPAddr, err)
}
httpAddr := fmt.Sprintf("%s:%d", addr.IP.String(), addr.Port)
conf.Node.HTTPAddr = httpAddr
a.clientHttpAddr = httpAddr
a.clientHTTPAddr = httpAddr
// Resolve the Client's RPC address
if a.config.AdvertiseAddrs.RPC != "" {
a.clientRpcAddr = a.config.AdvertiseAddrs.RPC
a.clientRPCAddr = a.config.AdvertiseAddrs.RPC
} else if a.config.Addresses.RPC != "" {
a.clientRpcAddr = fmt.Sprintf("%v:%v", a.config.Addresses.RPC, a.config.Ports.RPC)
a.clientRPCAddr = fmt.Sprintf("%v:%v", a.config.Addresses.RPC, a.config.Ports.RPC)
} else if a.config.BindAddr != "" {
a.clientRpcAddr = fmt.Sprintf("%v:%v", a.config.BindAddr, a.config.Ports.RPC)
a.clientRPCAddr = fmt.Sprintf("%v:%v", a.config.BindAddr, a.config.Ports.RPC)
} else {
a.clientRpcAddr = fmt.Sprintf("%v:%v", "127.0.0.1", a.config.Ports.RPC)
a.clientRPCAddr = fmt.Sprintf("%v:%v", "127.0.0.1", a.config.Ports.RPC)
}
addr, err = net.ResolveTCPAddr("tcp", a.clientRpcAddr)
addr, err = net.ResolveTCPAddr("tcp", a.clientRPCAddr)
if err != nil {
return nil, fmt.Errorf("error resolving RPC addr %q: %v:", a.clientRpcAddr, err)
return nil, fmt.Errorf("error resolving RPC addr %q: %v", a.clientRPCAddr, err)
}
a.clientRpcAddr = fmt.Sprintf("%s:%d", addr.IP.String(), addr.Port)
a.clientRPCAddr = fmt.Sprintf("%s:%d", addr.IP.String(), addr.Port)
// Reserve resources on the node.
r := conf.Node.Reserved
@@ -372,13 +372,13 @@ func (a *Agent) setupServer() error {
a.consulSyncer.SetServices(serviceGroupName, []*structs.ConsulService{
&structs.ConsulService{
Name: a.config.Consul.ServerServiceName,
PortLabel: a.serverHttpAddr,
Tags: []string{consul.ServiceTagHttp},
PortLabel: a.serverHTTPAddr,
Tags: []string{consul.ServiceTagHTTP},
},
&structs.ConsulService{
Name: a.config.Consul.ServerServiceName,
PortLabel: a.serverRpcAddr,
Tags: []string{consul.ServiceTagRpc},
PortLabel: a.serverRPCAddr,
Tags: []string{consul.ServiceTagRPC},
},
&structs.ConsulService{
PortLabel: a.serverSerfAddr,
@@ -423,13 +423,13 @@ func (a *Agent) setupClient() error {
a.consulSyncer.SetServices(serviceGroupName, []*structs.ConsulService{
&structs.ConsulService{
Name: a.config.Consul.ClientServiceName,
PortLabel: a.clientHttpAddr,
Tags: []string{consul.ServiceTagHttp},
PortLabel: a.clientHTTPAddr,
Tags: []string{consul.ServiceTagHTTP},
},
&structs.ConsulService{
Name: a.config.Consul.ClientServiceName,
PortLabel: a.clientRpcAddr,
Tags: []string{consul.ServiceTagRpc},
PortLabel: a.clientRPCAddr,
Tags: []string{consul.ServiceTagRPC},
},
})
}

12
command/agent/agent_test.go
View File

@@ -119,10 +119,10 @@ func TestAgent_ServerConfig(t *testing.T) {
if addr := out.RPCAdvertise; addr.IP.String() != "127.0.0.1" || addr.Port != 4001 {
t.Fatalf("bad rpc advertise addr: %#v", addr)
}
if addr := a.serverHttpAddr; addr != "10.10.11.1:4005" {
if addr := a.serverHTTPAddr; addr != "10.10.11.1:4005" {
t.Fatalf("expect 10.11.11.1:4005, got: %v", addr)
}
if addr := a.serverRpcAddr; addr != "127.0.0.1:4001" {
if addr := a.serverRPCAddr; addr != "127.0.0.1:4001" {
t.Fatalf("expect 127.0.0.1:4001, got: %v", addr)
}
@@ -158,11 +158,11 @@ func TestAgent_ServerConfig(t *testing.T) {
if addr := out.SerfConfig.MemberlistConfig.BindAddr; addr != "127.0.0.2" {
t.Fatalf("expect 127.0.0.2, got: %s", addr)
}
if addr := a.serverHttpAddr; addr != "127.0.0.2:4646" {
if addr := a.serverHTTPAddr; addr != "127.0.0.2:4646" {
t.Fatalf("expect 127.0.0.2:4646, got: %s", addr)
}
// NOTE: AdvertiseAddr > Addresses > BindAddr > Defaults
if addr := a.serverRpcAddr; addr != "127.0.0.1:4001" {
if addr := a.serverRPCAddr; addr != "127.0.0.1:4001" {
t.Fatalf("expect 127.0.0.1:4001, got: %s", addr)
}
if addr := a.serverSerfAddr; addr != "127.0.0.1:4000" {
@@ -211,10 +211,10 @@ func TestAgent_ServerConfig(t *testing.T) {
if addr := out.SerfConfig.MemberlistConfig.BindAddr; addr != "127.0.0.3" {
t.Fatalf("expect 127.0.0.3, got: %s", addr)
}
if addr := a.serverHttpAddr; addr != "127.0.0.3:4646" {
if addr := a.serverHTTPAddr; addr != "127.0.0.3:4646" {
t.Fatalf("expect 127.0.0.3:4646, got: %s", addr)
}
if addr := a.serverRpcAddr; addr != "127.0.0.3:4647" {
if addr := a.serverRPCAddr; addr != "127.0.0.3:4647" {
t.Fatalf("expect 127.0.0.3:4647, got: %s", addr)
}
if addr := a.serverSerfAddr; addr != "127.0.0.3:4648" {

10
command/agent/consul/syncer.go
View File

@@ -47,11 +47,11 @@ const (
// spend waiting for a response from a Consul Query.
DefaultQueryWaitDuration = 2 * time.Second
// ServiceTagHttp is the tag assigned to HTTP services
ServiceTagHttp = "http"
// ServiceTagHTTP is the tag assigned to HTTP services
ServiceTagHTTP = "http"
// ServiceTagRpc is the tag assigned to RPC services
ServiceTagRpc = "rpc"
// ServiceTagRPC is the tag assigned to RPC services
ServiceTagRPC = "rpc"
// ServiceTagSerf is the tag assigned to Serf services
ServiceTagSerf = "serf"
@@ -895,6 +895,7 @@ func (c *Syncer) AddPeriodicHandler(name string, fn types.PeriodicCallback) bool
return true
}
// NumHandlers returns the number of callbacks registered with the syncer
func (c *Syncer) NumHandlers() int {
c.periodicLock.RLock()
defer c.periodicLock.RUnlock()
@@ -908,6 +909,7 @@ func (c *Syncer) RemovePeriodicHandler(name string) {
delete(c.periodicCallbacks, name)
}
// ConsulClient returns the Consul client used by the Syncer.
func (c *Syncer) ConsulClient() *consul.Client {
return c.client
}