X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f2c2cb93161f2a50c23e6e6ebbdf2bb879e05da2..68f6929a58bf9aab7df691a0db1567e27bc942b8:/lib/service/cmd.go

diff --git a/lib/service/cmd.go b/lib/service/cmd.go
index 43357998d8..92c554ce53 100644
--- a/lib/service/cmd.go
+++ b/lib/service/cmd.go
@@ -121,13 +121,24 @@ 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, log)
+	listenURL, internalURL, err := getListenAddr(cluster.Services, c.svcName, log)
 	if err != nil {
 		return 1
 	}
-	ctx = context.WithValue(ctx, contextKeyURL{}, listenURL)
+	ctx = context.WithValue(ctx, contextKeyURL{}, internalURL)
 
 	reg := prometheus.NewRegistry()
+	loader.RegisterMetrics(reg)
+
+	// arvados_version_running{version="1.2.3~4"} 1.0
+	mVersion := prometheus.NewGaugeVec(prometheus.GaugeOpts{
+		Namespace: "arvados",
+		Name:      "version_running",
+		Help:      "Indicated version is running.",
+	}, []string{"version"})
+	mVersion.WithLabelValues(cmd.Version.String()).Set(1)
+	reg.MustRegister(mVersion)
+
 	handler := c.newHandler(ctx, cluster, cluster.SystemRootToken, reg)
 	if err = handler.CheckHealth(); err != nil {
 		return 1
@@ -146,7 +157,7 @@ func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout
 		},
 		Addr: listenURL.Host,
 	}
-	if listenURL.Scheme == "https" {
+	if listenURL.Scheme == "https" || listenURL.Scheme == "wss" {
 		tlsconfig, err := tlsConfigWithCertUpdater(cluster, logger)
 		if err != nil {
 			logger.WithError(err).Errorf("cannot start %s service on %s", c.svcName, listenURL.String())
@@ -212,28 +223,64 @@ func interceptHealthReqs(mgtToken string, checkHealth func() error, next http.Ha
 	return ifCollectionInHost(next, mux)
 }
 
-func getListenAddr(svcs arvados.Services, prog arvados.ServiceName, log logrus.FieldLogger) (arvados.URL, error) {
+func getListenAddr(svcs arvados.Services, prog arvados.ServiceName, log logrus.FieldLogger) (arvados.URL, arvados.URL, error) {
 	svc, ok := svcs.Map()[prog]
 	if !ok {
-		return arvados.URL{}, fmt.Errorf("unknown service name %q", prog)
+		return arvados.URL{}, 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)
+		return arvados.URL{}, arvados.URL{}, fmt.Errorf("$ARVADOS_SERVICE_INTERNAL_URL (%q): %s", want, err)
 	} else {
 		if url.Path == "" {
 			url.Path = "/"
 		}
-		return arvados.URL(*url), nil
+		internalURL := arvados.URL(*url)
+		listenURL := arvados.URL(*url)
+		if svc.ListenAddress != "" {
+			listenURL.Host = svc.ListenAddress
+		}
+		return listenURL, internalURL, nil
+	}
+
+	if svc.ListenAddress != "" {
+		scheme := ""
+		for internalURL := range svc.InternalURLs {
+			if internalURL.Host == svc.ListenAddress {
+				if len(svc.InternalURLs) > 1 {
+					log.Warnf("possible configuration error: multiple InternalURLs entries exist for %s but only %q will ever be used because it matches ListenAddress", prog, internalURL.String())
+				}
+				return internalURL, internalURL, nil
+			}
+			switch scheme {
+			case "":
+				scheme = internalURL.Scheme
+			case internalURL.Scheme:
+			default:
+				scheme = "-" // different InternalURLs have different schemes
+			}
+		}
+		if scheme == "-" {
+			return arvados.URL{}, arvados.URL{}, fmt.Errorf("cannot use ListenAddress %q: InternalURLs use multiple schemes and none have host %q", svc.ListenAddress, svc.ListenAddress)
+		}
+		if scheme == "" {
+			// No entries at all in InternalURLs
+			scheme = "http"
+		}
+		listenURL := arvados.URL{}
+		listenURL.Host = svc.ListenAddress
+		listenURL.Scheme = scheme
+		listenURL.Path = "/"
+		return listenURL, listenURL, nil
 	}
 
 	errors := []string{}
-	for url := range svc.InternalURLs {
-		listener, err := net.Listen("tcp", url.Host)
+	for internalURL := range svc.InternalURLs {
+		listener, err := net.Listen("tcp", internalURL.Host)
 		if err == nil {
 			listener.Close()
-			return url, nil
+			return internalURL, internalURL, 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
@@ -241,13 +288,13 @@ func getListenAddr(svcs arvados.Services, prog arvados.ServiceName, log logrus.F
 			// can't bind an IP address it doesn't own.
 			continue
 		} else {
-			errors = append(errors, fmt.Sprintf("tried %v, got %v", url, err))
+			errors = append(errors, fmt.Sprintf("tried %v, got %v", internalURL, err))
 		}
 	}
 	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{}, 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)
+	return arvados.URL{}, arvados.URL{}, fmt.Errorf("configuration does not enable the %q service on this host", prog)
 }
 
 type contextKeyURL struct{}