Merge branch '15370-loopback-dispatchcloud'

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

diff --git a/lib/boot/passenger.go b/lib/boot/passenger.go
index 4203939975618f9283b462866c1f16b14d16b5dd..f86f1f930398f48a133cc33fe4752333246b73cb 100644 (file)
--- a/lib/boot/passenger.go
+++ b/lib/boot/passenger.go
@@ -28,8 +28,9 @@ var railsEnv = []string{
 // Install a Rails application's dependencies, including phusion
 // passenger.
 type installPassenger struct {
-       src     string
-       depends []supervisedTask
+       src       string // path to app in source tree
+       varlibdir string // path to app (relative to /var/lib/arvados) in OS package: "railsapi" or "workbench1"
+       depends   []supervisedTask
 }
 
 func (runner installPassenger) String() string {
@@ -49,33 +50,61 @@ func (runner installPassenger) Run(ctx context.Context, fail func(error), super
        passengerInstallMutex.Lock()
        defer passengerInstallMutex.Unlock()
 
+       appdir := runner.src
+       if super.ClusterType == "test" {
+               // In the multi-cluster test setup, if we run multiple
+               // Rails instances directly from the source tree, they
+               // step on one another's files in {source}/tmp, log,
+               // etc. So instead we copy the source directory into a
+               // temp dir and run the Rails app from there.
+               appdir = filepath.Join(super.tempdir, runner.varlibdir)
+               err = super.RunProgram(ctx, super.tempdir, runOptions{}, "mkdir", "-p", appdir)
+               if err != nil {
+                       return err
+               }
+               err = super.RunProgram(ctx, filepath.Join(super.SourcePath, runner.src), runOptions{}, "rsync",
+                       "-a", "--no-owner", "--no-group", "--delete-after", "--delete-excluded",
+                       "--exclude", "/coverage",
+                       "--exclude", "/log",
+                       "--exclude", "/node_modules",
+                       "--exclude", "/tmp",
+                       "--exclude", "/public/assets",
+                       "--exclude", "/vendor",
+                       "--exclude", "/config/environments",
+                       "./",
+                       appdir+"/")
+               if err != nil {
+                       return err
+               }
+       }
+
        var buf bytes.Buffer
-       err = super.RunProgram(ctx, runner.src, runOptions{output: &buf}, "gem", "list", "--details", "bundler")
+       err = super.RunProgram(ctx, appdir, runOptions{output: &buf}, "gem", "list", "--details", "bundler")
        if err != nil {
                return err
        }
-       for _, version := range []string{"1.16.6", "1.17.3", "2.0.2"} {
+       for _, version := range []string{"2.2.19"} {
                if !strings.Contains(buf.String(), "("+version+")") {
-                       err = super.RunProgram(ctx, runner.src, runOptions{}, "gem", "install", "--user", "--conservative", "--no-document", "bundler:1.16.6", "bundler:1.17.3", "bundler:2.0.2")
+                       err = super.RunProgram(ctx, appdir, runOptions{}, "gem", "install", "--user", "--conservative", "--no-document", "bundler:2.2.19")
                        if err != nil {
                                return err
                        }
                        break
                }
        }
-       err = super.RunProgram(ctx, runner.src, runOptions{}, "bundle", "install", "--jobs", "4", "--path", filepath.Join(os.Getenv("HOME"), ".gem"))
+       err = super.RunProgram(ctx, appdir, runOptions{}, "bundle", "install", "--jobs", "4", "--path", filepath.Join(os.Getenv("HOME"), ".gem"))
        if err != nil {
                return err
        }
-       err = super.RunProgram(ctx, runner.src, runOptions{}, "bundle", "exec", "passenger-config", "build-native-support")
+       err = super.RunProgram(ctx, appdir, runOptions{}, "bundle", "exec", "passenger-config", "build-native-support")
        if err != nil {
                return err
        }
-       err = super.RunProgram(ctx, runner.src, runOptions{}, "bundle", "exec", "passenger-config", "install-standalone-runtime")
+       err = super.RunProgram(ctx, appdir, runOptions{}, "bundle", "exec", "passenger-config", "install-standalone-runtime")
        if err != nil {
                return err
        }
-       err = super.RunProgram(ctx, runner.src, runOptions{}, "bundle", "exec", "passenger-config", "validate-install")
+       err = super.RunProgram(ctx, appdir, runOptions{}, "bundle", "exec", "passenger-config", "validate-install")
        if err != nil && !strings.Contains(err.Error(), "exit status 2") {
                // Exit code 2 indicates there were warnings (like
                // "other passenger installations have been detected",
@@ -88,7 +117,7 @@ func (runner installPassenger) Run(ctx context.Context, fail func(error), super
 
 type runPassenger struct {
        src       string // path to app in source tree
-       varlibdir string // path to app (relative to /var/lib/arvados) in OS package
+       varlibdir string // path to app (relative to /var/lib/arvados) in OS package: "railsapi" or "workbench1"
        svc       arvados.Service
        depends   []supervisedTask
 }
@@ -102,14 +131,17 @@ func (runner runPassenger) Run(ctx context.Context, fail func(error), super *Sup
        if err != nil {
                return err
        }
-       port, err := internalPort(runner.svc)
+       host, port, err := internalPort(runner.svc)
        if err != nil {
                return fmt.Errorf("bug: no internalPort for %q: %v (%#v)", runner, err, runner.svc)
        }
        var appdir string
-       if super.ClusterType == "production" {
+       switch super.ClusterType {
+       case "production":
                appdir = "/var/lib/arvados/" + runner.varlibdir
-       } else {
+       case "test":
+               appdir = filepath.Join(super.tempdir, runner.varlibdir)
+       default:
                appdir = runner.src
        }
        loglevel := "4"
@@ -130,7 +162,8 @@ func (runner runPassenger) Run(ctx context.Context, fail func(error), super *Sup
                cmdline := []string{
                        "bundle", "exec",
                        "passenger", "start",
-                       "-p", port,
+                       "--address", host,
+                       "--port", port,
                        "--log-level", loglevel,
                        "--no-friendly-error-pages",
                        "--disable-anonymous-telemetry",