X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/3911cd836c4e937262d48f9b0af703a9d7d68cdd..7407f41105f8000bb3908d41a31daaf3a30d9440:/lib/service/cmd.go

diff --git a/lib/service/cmd.go b/lib/service/cmd.go
index 0391c5a043..901fda2289 100644
--- a/lib/service/cmd.go
+++ b/lib/service/cmd.go
@@ -12,14 +12,15 @@ import (
 	"io"
 	"net"
 	"net/http"
+	"net/url"
 	"os"
 	"strings"
 
-	"git.curoverse.com/arvados.git/lib/cmd"
-	"git.curoverse.com/arvados.git/lib/config"
-	"git.curoverse.com/arvados.git/sdk/go/arvados"
-	"git.curoverse.com/arvados.git/sdk/go/ctxlog"
-	"git.curoverse.com/arvados.git/sdk/go/httpserver"
+	"git.arvados.org/arvados.git/lib/cmd"
+	"git.arvados.org/arvados.git/lib/config"
+	"git.arvados.org/arvados.git/sdk/go/arvados"
+	"git.arvados.org/arvados.git/sdk/go/ctxlog"
+	"git.arvados.org/arvados.git/sdk/go/httpserver"
 	"github.com/coreos/go-systemd/daemon"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/sirupsen/logrus"
@@ -28,6 +29,7 @@ import (
 type Handler interface {
 	http.Handler
 	CheckHealth() error
+	Done() <-chan struct{}
 }
 
 type NewHandlerFunc func(_ context.Context, _ *arvados.Cluster, token string, registry *prometheus.Registry) Handler
@@ -58,7 +60,7 @@ func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout
 	var err error
 	defer func() {
 		if err != nil {
-			log.WithError(err).Info("exiting")
+			log.WithError(err).Error("exiting")
 		}
 	}()
 
@@ -147,9 +149,15 @@ func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout
 		logger.WithError(err).Errorf("error notifying init daemon")
 	}
 	go func() {
+		// Shut down server if caller cancels context
 		<-ctx.Done()
 		srv.Close()
 	}()
+	go func() {
+		// Shut down server if handler dies
+		<-handler.Done()
+		srv.Close()
+	}()
 	err = srv.Wait()
 	if err != nil {
 		return 1
@@ -164,23 +172,37 @@ func getListenAddr(svcs arvados.Services, prog arvados.ServiceName, log logrus.F
 	if !ok {
 		return arvados.URL{}, fmt.Errorf("unknown service name %q", prog)
 	}
-	for url := range svc.InternalURLs {
-		if strings.HasPrefix(url.Host, "localhost:") {
-			return url, nil
+
+	if want := os.Getenv("ARVADOS_SERVICE_INTERNAL_URL"); want == "" {
+	} else if url, err := url.Parse(want); err != nil {
+		return arvados.URL{}, fmt.Errorf("$ARVADOS_SERVICE_INTERNAL_URL (%q): %s", want, err)
+	} else {
+		if url.Path == "" {
+			url.Path = "/"
 		}
+		return arvados.URL(*url), nil
+	}
+
+	errors := []string{}
+	for url := range svc.InternalURLs {
 		listener, err := net.Listen("tcp", url.Host)
 		if err == nil {
 			listener.Close()
 			return url, nil
 		} else if strings.Contains(err.Error(), "cannot assign requested address") {
+			// If 'Host' specifies a different server than
+			// the current one, it'll resolve the hostname
+			// to IP address, and then fail because it
+			// can't bind an IP address it doesn't own.
 			continue
-		} else if strings.Contains(err.Error(), "address already in use") {
-			return url, err
 		} else {
-			log.Warn(err)
+			errors = append(errors, fmt.Sprintf("tried %v, got %v", url, err))
 		}
 	}
-	return arvados.URL{}, fmt.Errorf("configuration does not enable the %s service on this host", prog)
+	if len(errors) > 0 {
+		return arvados.URL{}, fmt.Errorf("could not enable the %q service on this host: %s", prog, strings.Join(errors, "; "))
+	}
+	return arvados.URL{}, fmt.Errorf("configuration does not enable the %q service on this host", prog)
 }
 
 type contextKeyURL struct{}