X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/18d6239d25924545ba91825011d467861cd5513c..8b873a9b3b8865a4d451263e48b49122b9c32759:/lib/service/cmd.go

diff --git a/lib/service/cmd.go b/lib/service/cmd.go
index 3447bfb16e..b6737bc553 100644
--- a/lib/service/cmd.go
+++ b/lib/service/cmd.go
@@ -6,22 +6,36 @@
 package service
 
 import (
+	"context"
 	"flag"
 	"fmt"
 	"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"
-	"github.com/Sirupsen/logrus"
+	"github.com/coreos/go-systemd/daemon"
+	"github.com/sirupsen/logrus"
 )
 
-type NewHandlerFunc func(*arvados.Cluster, *arvados.SystemNode) http.Handler
+type Handler interface {
+	http.Handler
+	CheckHealth() error
+}
+
+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
@@ -34,15 +48,12 @@ func Command(svcName arvados.ServiceName, newHandler NewHandlerFunc) cmd.Handler
 	return &command{
 		newHandler: newHandler,
 		svcName:    svcName,
+		ctx:        context.Background(),
 	}
 }
 
 func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout, stderr io.Writer) int {
-	log := logrus.New()
-	log.Formatter = &logrus.JSONFormatter{
-		TimestampFormat: rfc3339NanoFixed,
-	}
-	log.Out = stderr
+	log := ctxlog.New(stderr, "json", "info")
 
 	var err error
 	defer func() {
@@ -50,18 +61,25 @@ func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout
 			log.WithError(err).Info("exiting")
 		}
 	}()
+
 	flags := flag.NewFlagSet("", flag.ContinueOnError)
 	flags.SetOutput(stderr)
-	configFile := flags.String("config", arvados.DefaultConfigFile, "Site configuration `file`")
-	hostName := flags.String("host", "", "Host profile `name` to use in SystemNodes config (if blank, use hostname reported by OS)")
+
+	loader := config.NewLoader(stdin, log)
+	loader.SetupFlags(flags)
+	versionFlag := flags.Bool("version", false, "Write version information to stdout and exit 0")
+
 	err = flags.Parse(args)
 	if err == flag.ErrHelp {
 		err = nil
 		return 0
 	} else if err != nil {
 		return 2
+	} else if *versionFlag {
+		return cmd.Version.RunCommand(prog, args, stdin, stdout, stderr)
 	}
-	cfg, err := arvados.GetConfig(*configFile)
+
+	cfg, err := loader.Load()
 	if err != nil {
 		return 1
 	}
@@ -69,18 +87,41 @@ func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout
 	if err != nil {
 		return 1
 	}
-	node, err := cluster.GetSystemNode(*hostName)
+	log = ctxlog.New(stderr, cluster.SystemLogs.Format, cluster.SystemLogs.LogLevel).WithFields(logrus.Fields{
+		"PID": os.Getpid(),
+	})
+	ctx := ctxlog.Context(c.ctx, log)
+
+	listen, err := getListenAddr(cluster.Services, c.svcName)
 	if err != nil {
 		return 1
 	}
-	listen := node.ServicePorts()[c.svcName]
-	if listen == "" {
-		err = fmt.Errorf("configuration does not enable the %s service on this host", c.svcName)
+
+	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, cluster.SystemRootToken)
+	if err = handler.CheckHealth(); err != nil {
 		return 1
 	}
 	srv := &httpserver.Server{
 		Server: http.Server{
-			Handler: httpserver.AddRequestIDs(httpserver.LogRequests(log, c.newHandler(cluster, node))),
+			Handler: httpserver.HandlerWithContext(ctx,
+				httpserver.AddRequestIDs(httpserver.LogRequests(handler))),
 		},
 		Addr: listen,
 	}
@@ -92,6 +133,13 @@ func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout
 		"Listen":  srv.Addr,
 		"Service": c.svcName,
 	}).Info("listening")
+	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
@@ -100,3 +148,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)
+}