X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/646ea4328be842f4baa194205618c01910ec49db..a14150968c57cffebb79d6ef85e1944111bc1257:/lib/service/cmd.go

diff --git a/lib/service/cmd.go b/lib/service/cmd.go
index d99af0eea1..603f48890e 100644
--- a/lib/service/cmd.go
+++ b/lib/service/cmd.go
@@ -10,10 +10,15 @@ import (
 	"flag"
 	"fmt"
 	"io"
+	"io/ioutil"
+	"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"
@@ -26,11 +31,12 @@ type Handler interface {
 	CheckHealth() error
 }
 
-type NewHandlerFunc func(context.Context, *arvados.Cluster, *arvados.NodeProfile) Handler
+type NewHandlerFunc func(_ context.Context, _ *arvados.Cluster, token string) Handler
 
 type command struct {
 	newHandler NewHandlerFunc
 	svcName    arvados.ServiceName
+	ctx        context.Context // enables tests to shutdown service; no public API yet
 }
 
 // Command returns a cmd.Handler that loads site config, calls
@@ -43,6 +49,7 @@ func Command(svcName arvados.ServiceName, newHandler NewHandlerFunc) cmd.Handler
 	return &command{
 		newHandler: newHandler,
 		svcName:    svcName,
+		ctx:        context.Background(),
 	}
 }
 
@@ -58,7 +65,6 @@ func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout
 	flags := flag.NewFlagSet("", flag.ContinueOnError)
 	flags.SetOutput(stderr)
 	configFile := flags.String("config", arvados.DefaultConfigFile, "Site configuration `file`")
-	nodeProfile := flags.String("node-profile", "", "`Name` of NodeProfiles config entry to use (if blank, use $ARVADOS_NODE_PROFILE or hostname reported by OS)")
 	err = flags.Parse(args)
 	if err == flag.ErrHelp {
 		err = nil
@@ -66,7 +72,10 @@ func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout
 	} else if err != nil {
 		return 2
 	}
-	cfg, err := arvados.GetConfig(*configFile)
+	// Logged warnings are discarded for now: the config template
+	// is incomplete, which causes extra warnings about keys that
+	// are really OK.
+	cfg, err := config.LoadFile(*configFile, ctxlog.New(ioutil.Discard, "json", "error"))
 	if err != nil {
 		return 1
 	}
@@ -74,30 +83,41 @@ func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout
 	if err != nil {
 		return 1
 	}
-	log = ctxlog.New(stderr, cluster.Logging.Format, cluster.Logging.Level).WithFields(logrus.Fields{
+	log = ctxlog.New(stderr, cluster.SystemLogs.Format, cluster.SystemLogs.LogLevel).WithFields(logrus.Fields{
 		"PID": os.Getpid(),
 	})
-	ctx := ctxlog.Context(context.Background(), log)
-	profileName := *nodeProfile
-	if profileName == "" {
-		profileName = os.Getenv("ARVADOS_NODE_PROFILE")
-	}
-	profile, err := cluster.GetNodeProfile(profileName)
+	ctx := ctxlog.Context(c.ctx, log)
+
+	listen, err := getListenAddr(cluster.Services, c.svcName)
 	if err != nil {
 		return 1
 	}
-	listen := profile.ServicePorts()[c.svcName]
-	if listen == "" {
-		err = fmt.Errorf("configuration does not enable the %s service on this host", c.svcName)
-		return 1
+
+	if cluster.SystemRootToken == "" {
+		log.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 == "" {
+		log.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
+		}
 	}
-	handler := c.newHandler(ctx, cluster, profile)
+
+	handler := c.newHandler(ctx, cluster, cluster.SystemRootToken)
 	if err = handler.CheckHealth(); err != nil {
 		return 1
 	}
 	srv := &httpserver.Server{
 		Server: http.Server{
-			Handler: httpserver.AddRequestIDs(httpserver.LogRequests(log, handler)),
+			Handler: httpserver.HandlerWithContext(ctx,
+				httpserver.AddRequestIDs(httpserver.LogRequests(handler))),
 		},
 		Addr: listen,
 	}
@@ -112,6 +132,10 @@ func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout
 	if _, err := daemon.SdNotify(false, "READY=1"); err != nil {
 		log.WithError(err).Errorf("error notifying init daemon")
 	}
+	go func() {
+		<-ctx.Done()
+		srv.Close()
+	}()
 	err = srv.Wait()
 	if err != nil {
 		return 1
@@ -120,3 +144,21 @@ 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) (string, error) {
+	svc, ok := svcs.Map()[prog]
+	if !ok {
+		return "", fmt.Errorf("unknown service name %q", prog)
+	}
+	for url := range svc.InternalURLs {
+		if strings.HasPrefix(url.Host, "localhost:") {
+			return url.Host, nil
+		}
+		listener, err := net.Listen("tcp", url.Host)
+		if err == nil {
+			listener.Close()
+			return url.Host, nil
+		}
+	}
+	return "", fmt.Errorf("configuration does not enable the %s service on this host", prog)
+}