15954: Avoid doing concurrent bundle/passenger installs.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>

diff --git a/lib/boot/passenger.go b/lib/boot/passenger.go
index 61f97df5269ef8c70eedcc432b005a408a60e4e5..31b4afaadf26924f35660b5708e248cf70ea29f3 100644 (file)
--- a/lib/boot/passenger.go
+++ b/lib/boot/passenger.go
@@ -11,10 +11,15 @@ import (
        "os"
        "path/filepath"
        "strings"
+       "sync"
 
        "git.arvados.org/arvados.git/sdk/go/arvados"
 )
 
+// Don't trust "passenger-config" (or "bundle install") to handle
+// concurrent installs.
+var passengerInstallMutex sync.Mutex
+
 type installPassenger struct {
        src     string
        depends []bootTask
@@ -25,6 +30,9 @@ func (runner installPassenger) String() string {
 }
 
 func (runner installPassenger) Run(ctx context.Context, fail func(error), boot *Booter) error {
+       passengerInstallMutex.Lock()
+       defer passengerInstallMutex.Unlock()
+
        err := boot.wait(ctx, runner.depends...)
        if err != nil {
                return err