Merged changes from master

Author: ewoutp

service/arangodb.go

@@ -117,17 +117,11 @@ const (
 
 // A helper function:
 
-func normalizeHost(address string) string {
-	host, _, err := net.SplitHostPort(address)
-	if err != nil {
-		host = strings.Split(address, ":")[0]
-	}
+func normalizeHostName(host string) string {
 	if ip := net.ParseIP(host); ip != nil {
 		if ip.IsLoopback() {
-			return "127.0.0.1"
+			return "localhost"
 		}
-	} else if host == "localhost" {
-		return "127.0.0.1"
 	}
 	return host
 }
@@ -141,9 +135,9 @@ func (s *Service) testInstance(ctx context.Context, address string, port int) (u
 	instanceUp := make(chan bool)
 	go func() {
 		client := &http.Client{Timeout: time.Second * 10}
-
 		makeRequest := func() error {
-			url := fmt.Sprintf("http://%s:%d/_api/version", address, port)
+			addr := net.JoinHostPort(address, strconv.Itoa(port))
+			url := fmt.Sprintf("http://%s/_api/version", addr)
 			req, err := http.NewRequest("GET", url, nil)
 			if err != nil {
 				return maskAny(err)
@@ -178,24 +172,6 @@ func (s *Service) testInstance(ctx context.Context, address string, port int) (u
 	}
 }
 
-var confFileTemplate = `# ArangoDB configuration file
-#
-# Documentation:
-# https://docs.arangodb.com/Manual/Administration/Configuration/
-#
-
-[server]
-endpoint = tcp://0.0.0.0:%s
-threads = %d
-%s 
-
-[log]
-level = %s
-
-[javascript]
-v8-contexts = %d
-`
-
 func (s *Service) makeBaseArgs(myHostDir, myContainerDir string, myAddress string, myPort string, mode string) (args []string, configVolumes []Volume) {
 	hostConfFileName := filepath.Join(myHostDir, "arangod.conf")
 	containerConfFileName := filepath.Join(myContainerDir, "arangod.conf")
@@ -226,7 +202,7 @@ func (s *Service) makeBaseArgs(myHostDir, myContainerDir string, myAddress strin
 		serverSection := &configSection{
 			Name: "server",
 			Settings: map[string]string{
-				"endpoint":       fmt.Sprintf("tcp://0.0.0.0:%s", myPort),
+				"endpoint":       fmt.Sprintf("tcp://[::]:%s", myPort),
 				"threads":        threads,
 				"authentication": "false",
 			},
@@ -279,11 +255,12 @@ func (s *Service) makeBaseArgs(myHostDir, myContainerDir string, myAddress strin
 	if s.ServerThreads != 0 {
 		args = append(args, "--server.threads", strconv.Itoa(s.ServerThreads))
 	}
+	myTCPURL := "tcp://" + net.JoinHostPort(myAddress, myPort)
 	switch mode {
 	case "agent":
 		args = append(args,
 			"--agency.activate", "true",
-			"--agency.my-address", fmt.Sprintf("tcp://%s:%s", myAddress, myPort),
+			"--agency.my-address", myTCPURL,
 			"--agency.size", strconv.Itoa(s.AgencySize),
 			"--agency.supervision", "true",
 			"--foxx.queues", "false",
@@ -293,23 +270,23 @@ func (s *Service) makeBaseArgs(myHostDir, myContainerDir string, myAddress strin
 			if p.HasAgent && p.ID != s.ID {
 				args = append(args,
 					"--agency.endpoint",
-					fmt.Sprintf("tcp://%s:%d", p.Address, s.MasterPort+p.PortOffset+portOffsetAgent),
+					fmt.Sprintf("tcp://%s", net.JoinHostPort(p.Address, strconv.Itoa(s.MasterPort+p.PortOffset+portOffsetAgent))),
 				)
 			}
 		}
 	case "dbserver":
 		args = append(args,
-			"--cluster.my-address", fmt.Sprintf("tcp://%s:%s", myAddress, myPort),
+			"--cluster.my-address", myTCPURL,
 			"--cluster.my-role", "PRIMARY",
-			"--cluster.my-local-info", fmt.Sprintf("tcp://%s:%s", myAddress, myPort),
+			"--cluster.my-local-info", myTCPURL,
 			"--foxx.queues", "false",
 			"--server.statistics", "true",
 		)
 	case "coordinator":
 		args = append(args,
-			"--cluster.my-address", fmt.Sprintf("tcp://%s:%s", myAddress, myPort),
+			"--cluster.my-address", myTCPURL,
 			"--cluster.my-role", "COORDINATOR",
-			"--cluster.my-local-info", fmt.Sprintf("tcp://%s:%s", myAddress, myPort),
+			"--cluster.my-local-info", myTCPURL,
 			"--foxx.queues", "true",
 			"--server.statistics", "true",
 		)
@@ -319,7 +296,7 @@ func (s *Service) makeBaseArgs(myHostDir, myContainerDir string, myAddress strin
 			p := s.myPeers.Peers[i]
 			args = append(args,
 				"--cluster.agency-endpoint",
-				fmt.Sprintf("tcp://%s:%d", p.Address, s.MasterPort+p.PortOffset+portOffsetAgent),
+				fmt.Sprintf("tcp://%s", net.JoinHostPort(p.Address, strconv.Itoa(s.MasterPort+p.PortOffset+portOffsetAgent))),
 			)
 		}
 	}

service/peers.go

@@ -1,5 +1,12 @@
 package service
 
+import (
+	"fmt"
+	"net"
+	"strconv"
+	"strings"
+)
+
 type Peer struct {
 	ID         string // Unique of of the peer
 	Address    string // IP address of arangodb peer server
@@ -9,6 +16,13 @@ type Peer struct {
 	HasAgent   bool   // If set, this peer is running an agent
 }
 
+// CreateStarterURL creates a URL to the relative path to the starter on this peer.
+func (p Peer) CreateStarterURL(relPath string) string {
+	addr := net.JoinHostPort(p.Address, strconv.Itoa(p.Port))
+	relPath = strings.TrimPrefix(relPath, "/")
+	return fmt.Sprintf("http://%s/%s", addr, relPath)
+}
+
 // Peer information.
 // When this type (or any of the types used in here) is changed, increase `SetupConfigVersion`.
 type peers struct {

service/runner_docker.go

@@ -3,6 +3,7 @@ package service
 import (
 	"fmt"
 	"io/ioutil"
+	"net"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -243,7 +244,7 @@ func (r *dockerRunner) CreateStartArangodbCommand(index int, masterIP string, ma
 	addr := masterIP
 	hostPort := 4000 + (portOffsetIncrement * (index - 1))
 	if masterPort != "" {
-		addr = addr + ":" + masterPort
+		addr = net.JoinHostPort(addr, masterPort)
 		masterPortI, _ := strconv.Atoi(masterPort)
 		hostPort = masterPortI + (portOffsetIncrement * (index - 1))
 	}

service/runner_process.go

@@ -3,6 +3,7 @@ package service
 import (
 	"fmt"
 	"io/ioutil"
+	"net"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -80,7 +81,7 @@ func (r *processRunner) CreateStartArangodbCommand(index int, masterIP string, m
 	}
 	addr := masterIP
 	if masterPort != "" {
-		addr = addr + ":" + masterPort
+		addr = net.JoinHostPort(addr, masterPort)
 	}
 	return fmt.Sprintf("arangodb --dataDir=./db%d --join %s", index, addr)
 }

service/server.go

@@ -5,14 +5,16 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
+	"net"
 	"net/http"
 	"os"
 	"path/filepath"
+	"strconv"
 )
 
 type HelloRequest struct {
 	SlaveID      string // Unique ID of the slave
-	SlaveAddress string // Address used to reach the slave (if empty, this will be derived from the request)
+	SlaveAddress string // IP address used to reach the slave (if empty, this will be derived from the request)
 	SlavePort    int    // Port used to reach the slave
 	DataDir      string // Directory used for data by this slave
 }
@@ -58,7 +60,7 @@ func (s *Service) startHTTPServer() {
 			s.log.Fatalf("Failed to get HTTP port info: %#v", err)
 		}
 		addr := fmt.Sprintf("0.0.0.0:%d", containerPort)
-		s.log.Infof("Listening on %s (%s:%d)", addr, s.OwnAddress, hostPort)
+		s.log.Infof("Listening on %s (%s)", addr, net.JoinHostPort(s.OwnAddress, strconv.Itoa(hostPort)))
 		if err := http.ListenAndServe(addr, nil); err != nil {
 			s.log.Errorf("Failed to listen on %s: %v", addr, err)
 		}
@@ -77,7 +79,7 @@ func (s *Service) helloHandler(w http.ResponseWriter, r *http.Request) {
 		header := w.Header()
 		if len(s.myPeers.Peers) > 0 {
 			master := s.myPeers.Peers[0]
-			header.Add("Location", fmt.Sprintf("http://%s:%d/hello", master.Address, master.Port))
+			header.Add("Location", master.CreateStarterURL("/hello"))
 			w.WriteHeader(http.StatusTemporaryRedirect)
 		} else {
 			writeError(w, http.StatusBadRequest, "No master known.")
@@ -87,7 +89,12 @@ func (s *Service) helloHandler(w http.ResponseWriter, r *http.Request) {
 
 	// Learn my own address (if needed)
 	if len(s.myPeers.Peers) == 0 {
-		myself := normalizeHost(r.Host)
+		host, _, err := net.SplitHostPort(r.Host)
+		if err != nil {
+			writeError(w, http.StatusBadRequest, fmt.Sprintf("Cannot derive own host address: %v", err))
+			return
+		}
+		myself := normalizeHostName(host)
 		_, hostPort, _ := s.getHTTPServerPort()
 		s.myPeers.Peers = []Peer{
 			Peer{
@@ -118,9 +125,14 @@ func (s *Service) helloHandler(w http.ResponseWriter, r *http.Request) {
 
 		slaveAddr := req.SlaveAddress
 		if slaveAddr == "" {
-			slaveAddr = normalizeHost(r.RemoteAddr)
+			host, _, err := net.SplitHostPort(r.RemoteAddr)
+			if err != nil {
+				writeError(w, http.StatusBadRequest, "SlaveAddress must be set.")
+				return
+			}
+			slaveAddr = normalizeHostName(host)
 		} else {
-			slaveAddr = normalizeHost(slaveAddr)
+			slaveAddr = normalizeHostName(slaveAddr)
 		}
 		slavePort := req.SlavePort
 

service/slave.go

@@ -18,7 +18,8 @@ func (s *Service) startSlave(peerAddress string, runner Runner) {
 		masterPort, _ = strconv.Atoi(port)
 	}
 	for {
-		s.log.Infof("Contacting master %s:%d...", peerAddress, masterPort)
+		masterAddr := net.JoinHostPort(peerAddress, strconv.Itoa(masterPort))
+		s.log.Infof("Contacting master %s...", masterAddr)
 		_, hostPort, err := s.getHTTPServerPort()
 		if err != nil {
 			s.log.Fatalf("Failed to get HTTP server port: %#v", err)
@@ -31,7 +32,7 @@ func (s *Service) startSlave(peerAddress string, runner Runner) {
 		})
 		buf := bytes.Buffer{}
 		buf.Write(b)
-		r, e := http.Post(fmt.Sprintf("http://%s:%d/hello", peerAddress, masterPort), "application/json", &buf)
+		r, e := http.Post(fmt.Sprintf("http://%s/hello", masterAddr), "application/json", &buf)
 		if e != nil {
 			s.log.Infof("Cannot start because of error from master: %v", e)
 			time.Sleep(time.Second)
@@ -76,7 +77,7 @@ func (s *Service) startSlave(peerAddress string, runner Runner) {
 		}
 		time.Sleep(time.Second)
 		master := s.myPeers.Peers[0]
-		r, err := http.Get(fmt.Sprintf("http://%s:%d/hello", master.Address, master.Port))
+		r, err := http.Get(master.CreateStarterURL("/hello"))
 		if err != nil {
 			s.log.Errorf("Failed to connect to master: %v", err)
 			time.Sleep(time.Second * 2)
@@ -97,7 +98,7 @@ func (s *Service) sendMasterGoodbye() error {
 		// I'm the master, do nothing
 		return nil
 	}
-	u := fmt.Sprintf("http://%s:%d/goodbye", master.Address, master.Port)
+	u := master.CreateStarterURL("/goodbye")
 	s.log.Infof("Saying goodbye to master at %s", u)
 	req := GoodbyeRequest{SlaveID: s.ID}
 	data, err := json.Marshal(req)