From: Tom Clegg <tom@curii.com>
Date: Tue, 19 Jul 2022 21:34:17 +0000 (-0400)
Subject: 17344: Use #cpus as 'bundle install' concurrency.
X-Git-Tag: 2.5.0~115^2~7
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/d0a076cc20d4e67c5695268b1dbf5e6862eab5b0

17344: Use #cpus as 'bundle install' concurrency.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
---

diff --git a/lib/boot/passenger.go b/lib/boot/passenger.go
index e0eec5ee4a..5367337e81 100644
--- a/lib/boot/passenger.go
+++ b/lib/boot/passenger.go
@@ -10,6 +10,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"runtime"
 	"strings"
 	"sync"
 
@@ -96,7 +97,7 @@ func (runner installPassenger) Run(ctx context.Context, fail func(error), super
 	if err != nil {
 		return err
 	}
-	err = super.RunProgram(ctx, appdir, runOptions{}, "bundle", "install", "--jobs", "4")
+	err = super.RunProgram(ctx, appdir, runOptions{}, "bundle", "install", "--jobs", fmt.Sprintf("%d", runtime.NumCPU()))
 	if err != nil {
 		return err
 	}
diff --git a/lib/install/deps.go b/lib/install/deps.go
index a5c428d0a0..187bac4b42 100644
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -17,6 +17,7 @@ import (
 	"os/exec"
 	"os/user"
 	"path/filepath"
+	"runtime"
 	"strconv"
 	"strings"
 	"syscall"
@@ -644,7 +645,7 @@ done
 				{"sudo", "-u", "www-data", "/var/lib/arvados/bin/bundle", "config", "set", "--local", "deployment", "true"},
 				{"sudo", "-u", "www-data", "/var/lib/arvados/bin/bundle", "config", "set", "--local", "path", "/var/www/.gem"},
 				{"sudo", "-u", "www-data", "/var/lib/arvados/bin/bundle", "config", "set", "--local", "without", "development test diagnostics performance"},
-				{"sudo", "-u", "www-data", "/var/lib/arvados/bin/bundle", "install", "--jobs", "8"},
+				{"sudo", "-u", "www-data", "/var/lib/arvados/bin/bundle", "install", "--jobs", fmt.Sprintf("%d", runtime.NumCPU())},
 
 				{"chown", "www-data:www-data", ".", "public/assets"},
 				// {"sudo", "-u", "www-data", "/var/lib/arvados/bin/bundle", "config", "set", "--local", "system", "true"},