luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Merge branch 'master' of github.com:hashicorp/nomad

This commit is contained in:
Diptanu Choudhury 2016-10-31 18:18:13 -07:00
parent eedf0120cd 674e572d35
commit 10da77ec53
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
command/agent/agent.go
View File

@ -537,29 +537,40 @@ func (a *Agent) getSerfAddr(bind bool) (*net.TCPAddr, error) {
bindAddr := a.config.Addresses.Serf bindAddr := a.config.Addresses.Serf
globalBindAddr := a.config.BindAddr globalBindAddr := a.config.BindAddr
port := a.config.Ports.Serf port := a.config.Ports.Serf
return pickAddress(bind, globalBindAddr, advertAddr, bindAddr, port, "RPC") return pickAddress(bind, globalBindAddr, advertAddr, bindAddr, port, "Serf")
} }
// pickAddress is a shared helper to pick the address to either bind to or // pickAddress is a shared helper to pick the address to either bind to or
// advertise. // advertise.
func pickAddress(bind bool, globalBindAddr, advertiseAddr, bindAddr string, port int, service string) (*net.TCPAddr, error) { func pickAddress(bind bool, globalBindAddr, advertiseAddr, bindAddr string, port int, service string) (*net.TCPAddr, error) {
portConverted := strconv.Itoa(port)
var serverAddr string var serverAddr string
if advertiseAddr != "" && !bind { if advertiseAddr != "" && !bind {
serverAddr = advertiseAddr serverAddr = advertiseAddr
// Check if the advertise has a port
if host, pport, err := net.SplitHostPort(advertiseAddr); err == nil {
if parsed, err := strconv.Atoi(pport); err == nil {
serverAddr = host
port = parsed
}
}
} else if bindAddr != "" && !(bindAddr == "0.0.0.0" && !bind) { } else if bindAddr != "" && !(bindAddr == "0.0.0.0" && !bind) {
serverAddr = net.JoinHostPort(bindAddr, portConverted) serverAddr = bindAddr
} else if globalBindAddr != "" && !(globalBindAddr == "0.0.0.0" && !bind) { } else if globalBindAddr != "" && !(globalBindAddr == "0.0.0.0" && !bind) {
serverAddr = net.JoinHostPort(globalBindAddr, portConverted) serverAddr = globalBindAddr
} else { } else {
serverAddr = net.JoinHostPort("127.0.0.1", portConverted) serverAddr = "127.0.0.1"
} }
addr, err := net.ResolveTCPAddr("tcp", serverAddr) ip := net.ParseIP(serverAddr)
if err != nil { if ip == nil {
return nil, fmt.Errorf("error resolving %s addr %+q: %v", service, serverAddr, err) return nil, fmt.Errorf("Failed to parse %s address: %q", service, serverAddr)
} }
return addr, nil
return &net.TCPAddr{
IP: ip,
Port: port,
}, nil
} }
// reservePortsForClient reserves a range of ports for the client to use when // reservePortsForClient reserves a range of ports for the client to use when

6
command/agent/agent_test.go
View File

@ -98,7 +98,7 @@ func TestAgent_ServerConfig(t *testing.T) {
// Returns error on bad serf addr // Returns error on bad serf addr
conf.AdvertiseAddrs.Serf = "nope" conf.AdvertiseAddrs.Serf = "nope"
_, err := a.serverConfig() _, err := a.serverConfig()
if err == nil || !strings.Contains(err.Error(), "error resolving Serf addr") { if err == nil || !strings.Contains(err.Error(), "Failed to parse Serf address") {
t.Fatalf("expected serf address error, got: %#v", err) t.Fatalf("expected serf address error, got: %#v", err)
} }
conf.AdvertiseAddrs.Serf = "127.0.0.1:4000" conf.AdvertiseAddrs.Serf = "127.0.0.1:4000"
@ -106,7 +106,7 @@ func TestAgent_ServerConfig(t *testing.T) {
// Returns error on bad rpc addr // Returns error on bad rpc addr
conf.AdvertiseAddrs.RPC = "nope" conf.AdvertiseAddrs.RPC = "nope"
_, err = a.serverConfig() _, err = a.serverConfig()
if err == nil || !strings.Contains(err.Error(), "error resolving RPC addr") { if err == nil || !strings.Contains(err.Error(), "Failed to parse RPC address") {
t.Fatalf("expected rpc address error, got: %#v", err) t.Fatalf("expected rpc address error, got: %#v", err)
} }
conf.AdvertiseAddrs.RPC = "127.0.0.1:4001" conf.AdvertiseAddrs.RPC = "127.0.0.1:4001"
@ -155,7 +155,7 @@ func TestAgent_ServerConfig(t *testing.T) {
conf.Addresses.RPC = "127.0.0.2" conf.Addresses.RPC = "127.0.0.2"
conf.Addresses.Serf = "127.0.0.2" conf.Addresses.Serf = "127.0.0.2"
conf.Addresses.HTTP = "127.0.0.2" conf.Addresses.HTTP = "127.0.0.2"
conf.AdvertiseAddrs.HTTP = "10.0.0.10:4646" conf.AdvertiseAddrs.HTTP = "10.0.0.10"
conf.AdvertiseAddrs.RPC = "" conf.AdvertiseAddrs.RPC = ""
conf.AdvertiseAddrs.Serf = "10.0.0.12:4004" conf.AdvertiseAddrs.Serf = "10.0.0.12:4004"