X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/1b6b38c5d2e181f357cab883b63917cb5eaa778c..d85da11d964117ae0eafc5f73c9cfdefdddc4d2a:/lib/service/cmd.go

diff --git a/lib/service/cmd.go b/lib/service/cmd.go
index d5619b87b3..7f2f78ee9a 100644
--- a/lib/service/cmd.go
+++ b/lib/service/cmd.go
@@ -16,11 +16,11 @@ import (
 	"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"
@@ -59,7 +59,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")
 		}
 	}()
 
@@ -104,29 +104,12 @@ func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout
 	})
 	ctx := ctxlog.Context(c.ctx, logger)
 
-	listenURL, err := getListenAddr(cluster.Services, c.svcName)
+	listenURL, err := getListenAddr(cluster.Services, c.svcName, log)
 	if err != nil {
 		return 1
 	}
 	ctx = context.WithValue(ctx, contextKeyURL{}, listenURL)
 
-	if cluster.SystemRootToken == "" {
-		logger.Warn("SystemRootToken missing from cluster config, falling back to ARVADOS_API_TOKEN environment variable")
-		cluster.SystemRootToken = os.Getenv("ARVADOS_API_TOKEN")
-	}
-	if cluster.Services.Controller.ExternalURL.Host == "" {
-		logger.Warn("Services.Controller.ExternalURL missing from cluster config, falling back to ARVADOS_API_HOST(_INSECURE) environment variables")
-		u, err := url.Parse("https://" + os.Getenv("ARVADOS_API_HOST"))
-		if err != nil {
-			err = fmt.Errorf("ARVADOS_API_HOST: %s", err)
-			return 1
-		}
-		cluster.Services.Controller.ExternalURL = arvados.URL(*u)
-		if i := os.Getenv("ARVADOS_API_HOST_INSECURE"); i != "" && i != "0" {
-			cluster.TLS.Insecure = true
-		}
-	}
-
 	reg := prometheus.NewRegistry()
 	handler := c.newHandler(ctx, cluster, cluster.SystemRootToken, reg)
 	if err = handler.CheckHealth(); err != nil {
@@ -177,22 +160,39 @@ func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout
 
 const rfc3339NanoFixed = "2006-01-02T15:04:05.000000000Z07:00"
 
-func getListenAddr(svcs arvados.Services, prog arvados.ServiceName) (arvados.URL, error) {
+func getListenAddr(svcs arvados.Services, prog arvados.ServiceName, log logrus.FieldLogger) (arvados.URL, error) {
 	svc, ok := svcs.Map()[prog]
 	if !ok {
 		return arvados.URL{}, fmt.Errorf("unknown service name %q", prog)
 	}
+
+	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 {
+		return arvados.URL(*url), nil
+	}
+
+	errors := []string{}
 	for url := range svc.InternalURLs {
-		if strings.HasPrefix(url.Host, "localhost:") {
-			return url, nil
-		}
 		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 {
+			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{}