18699: boot.Supervisor support for multi-cluster config file.

[arvados.git] / lib / boot / cmd.go

diff --git a/lib/boot/cmd.go b/lib/boot/cmd.go
index 373613bb35d7c30d5803df0e6b6cc4b02cf4f410..6a32ab142de79115c136e3e674936041af390bc5 100644 (file)
--- a/lib/boot/cmd.go
+++ b/lib/boot/cmd.go
@@ -13,7 +13,6 @@ import (
        "time"
 
        "git.arvados.org/arvados.git/lib/cmd"
-       "git.arvados.org/arvados.git/lib/config"
        "git.arvados.org/arvados.git/sdk/go/ctxlog"
 )
 
@@ -30,6 +29,7 @@ type supervisedTask interface {
 }
 
 var errNeedConfigReload = errors.New("config changed, restart needed")
+var errParseFlags = errors.New("error parsing command line arguments")
 
 type bootCommand struct{}
 
@@ -40,6 +40,8 @@ func (bcmd bootCommand) RunCommand(prog string, args []string, stdin io.Reader,
                err := bcmd.run(ctx, prog, args, stdin, stdout, stderr)
                if err == errNeedConfigReload {
                        continue
+               } else if err == errParseFlags {
+                       return 2
                } else if err != nil {
                        logger.WithError(err).Info("exiting")
                        return 1
@@ -53,27 +55,30 @@ func (bcmd bootCommand) run(ctx context.Context, prog string, args []string, std
        ctx, cancel := context.WithCancel(ctx)
        defer cancel()
        super := &Supervisor{
+               Stdin:  stdin,
                Stderr: stderr,
                logger: ctxlog.FromContext(ctx),
        }
 
        flags := flag.NewFlagSet(prog, flag.ContinueOnError)
-       flags.SetOutput(stderr)
-       loader := config.NewLoader(stdin, super.logger)
-       loader.SetupFlags(flags)
        versionFlag := flags.Bool("version", false, "Write version information to stdout and exit 0")
+       flags.StringVar(&super.ConfigPath, "config", "/etc/arvados/config.yml", "arvados config file `path`")
        flags.StringVar(&super.SourcePath, "source", ".", "arvados source tree `directory`")
        flags.StringVar(&super.ClusterType, "type", "production", "cluster `type`: development, test, or production")
-       flags.StringVar(&super.ListenHost, "listen-host", "localhost", "host name or interface address for service listeners")
+       flags.StringVar(&super.ListenHost, "listen-host", "localhost", "host name or interface address for external services, and internal services whose InternalURLs are not configured")
        flags.StringVar(&super.ControllerAddr, "controller-address", ":0", "desired controller address, `host:port` or `:port`")
+       flags.StringVar(&super.Workbench2Source, "workbench2-source", "../arvados-workbench2", "path to arvados-workbench2 source tree")
+       flags.BoolVar(&super.NoWorkbench1, "no-workbench1", false, "do not run workbench1")
+       flags.BoolVar(&super.NoWorkbench2, "no-workbench2", true, "do not run workbench2")
        flags.BoolVar(&super.OwnTemporaryDatabase, "own-temporary-database", false, "bring up a postgres server and create a temporary database")
        timeout := flags.Duration("timeout", 0, "maximum time to wait for cluster to be ready")
        shutdown := flags.Bool("shutdown", false, "shut down when the cluster becomes ready")
-       err := flags.Parse(args)
-       if err == flag.ErrHelp {
-               return nil
-       } else if err != nil {
-               return err
+       if ok, code := cmd.ParseFlags(flags, prog, args, "", stderr); !ok {
+               if code == 0 {
+                       return nil
+               } else {
+                       return errParseFlags
+               }
        } else if *versionFlag {
                cmd.Version.RunCommand(prog, args, stdin, stdout, stderr)
                return nil
@@ -81,13 +86,7 @@ func (bcmd bootCommand) run(ctx context.Context, prog string, args []string, std
                return fmt.Errorf("cluster type must be 'development', 'test', or 'production'")
        }
 
-       loader.SkipAPICalls = true
-       cfg, err := loader.Load()
-       if err != nil {
-               return err
-       }
-
-       super.Start(ctx, cfg, loader.Path)
+       super.Start(ctx)
        defer super.Stop()
 
        var timer *time.Timer
@@ -95,23 +94,28 @@ func (bcmd bootCommand) run(ctx context.Context, prog string, args []string, std
                timer = time.AfterFunc(*timeout, super.Stop)
        }
 
-       url, ok := super.WaitReady()
+       ok := super.WaitReady()
        if timer != nil && !timer.Stop() {
                return errors.New("boot timed out")
        } else if !ok {
                super.logger.Error("boot failed")
        } else {
-               // Write controller URL to stdout. Nothing else goes
-               // to stdout, so this provides an easy way for a
-               // calling script to discover the controller URL when
-               // everything is ready.
-               fmt.Fprintln(stdout, url)
+               // Write each cluster's controller URL to stdout.
+               // Nothing else goes to stdout, so this allows a
+               // calling script to determine when the cluster is
+               // ready to use, and the controller's host:port (which
+               // may have been dynamically assigned depending on
+               // config/options).
+               for _, cc := range super.Clusters() {
+                       fmt.Fprintln(stdout, cc.Services.Controller.ExternalURL)
+               }
                if *shutdown {
                        super.Stop()
                        // Wait for children to exit. Don't report the
                        // ensuing "context cancelled" error, though:
                        // return nil to indicate successful startup.
                        _ = super.Wait()
+                       fmt.Fprintln(stderr, "PASS - all services booted successfully")
                        return nil
                }
        }