X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b1ed7c643f311605092991e01bcc3437130d6072..5f41a89121dea9d536ea33391ae2827432db947b:/lib/boot/cmd.go

diff --git a/lib/boot/cmd.go b/lib/boot/cmd.go
index 6a32ab142d..4b7284556e 100644
--- a/lib/boot/cmd.go
+++ b/lib/boot/cmd.go
@@ -10,10 +10,12 @@ import (
 	"flag"
 	"fmt"
 	"io"
+	"sort"
 	"time"
 
 	"git.arvados.org/arvados.git/lib/cmd"
 	"git.arvados.org/arvados.git/sdk/go/ctxlog"
+	"github.com/coreos/go-systemd/daemon"
 )
 
 var Command cmd.Handler = bootCommand{}
@@ -65,11 +67,11 @@ func (bcmd bootCommand) run(ctx context.Context, prog string, args []string, std
 	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 external services, and internal services whose InternalURLs are not configured")
+	flags.StringVar(&super.ListenHost, "listen-host", "localhost", "host name or interface address for 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.NoWorkbench2, "no-workbench2", false, "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")
@@ -100,15 +102,29 @@ func (bcmd bootCommand) run(ctx context.Context, prog string, args []string, std
 	} else if !ok {
 		super.logger.Error("boot failed")
 	} else {
-		// 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)
+		// Write each cluster's controller URL, id, and URL
+		// host:port 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).
+		//
+		// Sort output by cluster ID for convenience.
+		var ids []string
+		for id := range super.Clusters() {
+			ids = append(ids, id)
 		}
+		sort.Strings(ids)
+		for _, id := range ids {
+			cc := super.Cluster(id)
+			// Providing both scheme://host:port and
+			// host:port is redundant, but convenient.
+			fmt.Fprintln(stdout, cc.Services.Controller.ExternalURL, id, cc.Services.Controller.ExternalURL.Host)
+		}
+		// Write ".\n" to mark the end of the list of
+		// controllers, in case the caller doesn't already
+		// know how many clusters are coming up.
+		fmt.Fprintln(stdout, ".")
 		if *shutdown {
 			super.Stop()
 			// Wait for children to exit. Don't report the
@@ -119,6 +135,9 @@ func (bcmd bootCommand) run(ctx context.Context, prog string, args []string, std
 			return nil
 		}
 	}
+	if _, err := daemon.SdNotify(false, "READY=1"); err != nil {
+		super.logger.WithError(err).Errorf("error notifying init daemon")
+	}
 	// Wait for signal/crash + orderly shutdown
 	return super.Wait()
 }