From 843b4f60e315564e0e19b98dd81431efeda3eaae Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Tue, 3 May 2022 23:34:13 -0400 Subject: [PATCH] 15370: Avoid running multiple instances of rails apps from same dir. Otherwise, cluster z1111, z2222, z3333 share a cache directory (Rails.root+"/tmp"), and end up serving one another's cached discovery docs. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- lib/boot/passenger.go | 47 +++++++++++++++++++++++++++++++++--------- lib/boot/supervisor.go | 8 +++---- 2 files changed, 41 insertions(+), 14 deletions(-) diff --git a/lib/boot/passenger.go b/lib/boot/passenger.go index f0cd02946f..410befab90 100644 --- 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 + varlibdir string + depends []supervisedTask } func (runner installPassenger) String() string { @@ -49,33 +50,56 @@ func (runner installPassenger) Run(ctx context.Context, fail func(error), super passengerInstallMutex.Lock() defer passengerInstallMutex.Unlock() + appdir := runner.src + if super.ClusterType == "test" { + 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{"2.2.19"} { if !strings.Contains(buf.String(), "("+version+")") { - err = super.RunProgram(ctx, runner.src, runOptions{}, "gem", "install", "--user", "--conservative", "--no-document", "bundler:2.2.19") + 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", @@ -107,9 +131,12 @@ func (runner runPassenger) Run(ctx context.Context, fail func(error), super *Sup 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" diff --git a/lib/boot/supervisor.go b/lib/boot/supervisor.go index a5d61b4a1c..5ec1b22448 100644 --- a/lib/boot/supervisor.go +++ b/lib/boot/supervisor.go @@ -370,14 +370,14 @@ func (super *Supervisor) runCluster() error { runServiceCommand{name: "keepstore", svc: super.cluster.Services.Keepstore}, runServiceCommand{name: "keep-web", svc: super.cluster.Services.WebDAV}, runServiceCommand{name: "ws", svc: super.cluster.Services.Websocket, depends: []supervisedTask{seedDatabase{}}}, - installPassenger{src: "services/api"}, - runPassenger{src: "services/api", varlibdir: "railsapi", svc: super.cluster.Services.RailsAPI, depends: []supervisedTask{createCertificates{}, seedDatabase{}, installPassenger{src: "services/api"}}}, + installPassenger{src: "services/api", varlibdir: "railsapi"}, + runPassenger{src: "services/api", varlibdir: "railsapi", svc: super.cluster.Services.RailsAPI, depends: []supervisedTask{createCertificates{}, seedDatabase{}, installPassenger{src: "services/api", varlibdir: "railsapi"}}}, seedDatabase{}, } if !super.NoWorkbench1 { tasks = append(tasks, - installPassenger{src: "apps/workbench", depends: []supervisedTask{seedDatabase{}}}, // dependency ensures workbench doesn't delay api install/startup - runPassenger{src: "apps/workbench", varlibdir: "workbench1", svc: super.cluster.Services.Workbench1, depends: []supervisedTask{installPassenger{src: "apps/workbench"}}}, + installPassenger{src: "apps/workbench", varlibdir: "workbench1", depends: []supervisedTask{seedDatabase{}}}, // dependency ensures workbench doesn't delay api install/startup + runPassenger{src: "apps/workbench", varlibdir: "workbench1", svc: super.cluster.Services.Workbench1, depends: []supervisedTask{installPassenger{src: "apps/workbench", varlibdir: "workbench1"}}}, ) } if !super.NoWorkbench2 { -- 2.30.2