X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f04693da1811e670d4cbb981debeecf14d79137c..6d5d0c69464455b8be6dac693ebfd383fc1bcee3:/lib/service/cmd.go diff --git a/lib/service/cmd.go b/lib/service/cmd.go index c410e53684..c85f034d94 100644 --- a/lib/service/cmd.go +++ b/lib/service/cmd.go @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: Apache-2.0 -// package service provides a cmd.Handler that brings up a system service. +// Package service provides a cmd.Handler that brings up a system service. package service import ( @@ -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" @@ -29,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 @@ -59,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") } }() @@ -79,6 +80,14 @@ func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout return cmd.Version.RunCommand(prog, args, stdin, stdout, stderr) } + if strings.HasSuffix(prog, "controller") { + // Some config-loader checks try to make API calls via + // controller. Those can't be expected to work if this + // process _is_ the controller: we haven't started an + // http server yet. + loader.SkipAPICalls = true + } + cfg, err := loader.Load() if err != nil { return 1 @@ -96,28 +105,11 @@ 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, internalURL, 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 - } - } + ctx = context.WithValue(ctx, contextKeyURL{}, internalURL) reg := prometheus.NewRegistry() handler := c.newHandler(ctx, cluster, cluster.SystemRootToken, reg) @@ -136,7 +128,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()) @@ -157,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 @@ -167,24 +165,55 @@ func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout return 0 } -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, 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{}, arvados.URL{}, fmt.Errorf("$ARVADOS_SERVICE_INTERNAL_URL (%q): %s", want, err) + } else { + if url.Path == "" { + url.Path = "/" + } + internalURL := arvados.URL(*url) + listenURL := arvados.URL(*url) + if svc.ListenAddress != "" { + listenURL.Host = svc.ListenAddress + } + return listenURL, internalURL, nil } - for url := range svc.InternalURLs { - if strings.HasPrefix(url.Host, "localhost:") { - return url, nil + + if svc.ListenAddress != "" { + for internalURL := range svc.InternalURLs { + listenURL := internalURL + listenURL.Host = svc.ListenAddress + return listenURL, internalURL, nil } - listener, err := net.Listen("tcp", url.Host) + } + + errors := []string{} + 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 + // 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", internalURL, err)) } } - return arvados.URL{}, fmt.Errorf("configuration does not enable the %s service on this host", prog) + if len(errors) > 0 { + return arvados.URL{}, 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("configuration does not enable the %q service on this host", prog) } type contextKeyURL struct{}