13647: Don't do API calls while loading controller config.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

diff --git a/lib/config/deprecated_keepstore.go b/lib/config/deprecated_keepstore.go
index 1969c4c3c31f6bba0b597fe775f14025bd41cb5d..04e937cc5cbfbe8f77f84a7877f3d4b4ccfaadd9 100644 (file)
--- a/lib/config/deprecated_keepstore.go
+++ b/lib/config/deprecated_keepstore.go
@@ -585,6 +585,10 @@ func (ldr *Loader) checkPendingKeepstoreMigrations(cluster arvados.Cluster) erro
                ldr.Logger.Debug("Services.Controller.ExternalURL not configured -- skipping check for pending keepstore config migrations")
                return nil
        }
+       if ldr.SkipAPICalls {
+               ldr.Logger.Debug("(Loader).SkipAPICalls == true -- skipping check for pending keepstore config migrations")
+               return nil
+       }
        client, err := arvados.NewClientFromConfig(&cluster)
        if err != nil {
                return err

diff --git a/lib/config/load.go b/lib/config/load.go
index db4bc9f597e443d5554b6f422df35aa31d673598..93c36f69ed47d0df580f62a137bc44997db718c1 100644 (file)
--- a/lib/config/load.go
+++ b/lib/config/load.go
@@ -28,6 +28,7 @@ type Loader struct {
        Logger         logrus.FieldLogger
        SkipDeprecated bool // Don't load deprecated config keys
        SkipLegacy     bool // Don't load legacy config files
+       SkipAPICalls   bool // Don't do checks that call RailsAPI/controller
 
        Path                    string
        KeepstorePath           string

diff --git a/lib/service/cmd.go b/lib/service/cmd.go
index c410e536847dde841d3f7f1ad553f07acb93cc55..d5619b87b307c53e781ea77b78ba943b20f78735 100644 (file)
--- a/lib/service/cmd.go
+++ b/lib/service/cmd.go
@@ -79,6 +79,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