[arvados] updated: 2.1.0-2724-ge12c1fed6

[git repository hosting]

Summary of changes:
 lib/boot/nginx.go     | 13 ++++++++++++-
 lib/boot/passenger.go |  6 +++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

       via  e12c1fed6336048d6ab854bbfab95eccf7c1b372 (commit)
       via  1533034e5ef86ce3f3696a42d390c21bd546dab6 (commit)
      from  20d7bfd30b4c890246c7ad72d6c96f93417f12ee (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit e12c1fed6336048d6ab854bbfab95eccf7c1b372
Author: Tom Clegg <tom at curii.com>
Date:   Thu Jul 14 00:23:18 2022 -0400

    16552: Avoid port collision due to port assignment races in tests.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/boot/nginx.go b/lib/boot/nginx.go
index 8a29823a1..b391c4dc8 100644
--- a/lib/boot/nginx.go
+++ b/lib/boot/nginx.go
@@ -32,8 +32,19 @@ func (runNginx) Run(ctx context.Context, fail func(error), super *Supervisor) er
 	if err != nil {
 		return err
 	}
+	extListenHost := "0.0.0.0"
+	if super.ClusterType == "test" {
+		// Our dynamic port number assignment strategy (choose
+		// an available port, write it in a config file, and
+		// have another process/goroutine bind to it) is prone
+		// to races when used by concurrent supervisors. In
+		// test mode we don't accept remote connections, so we
+		// can avoid collisions by using the per-cluster
+		// loopback address instead of 0.0.0.0.
+		extListenHost = super.ListenHost
+	}
 	vars := map[string]string{
-		"LISTENHOST":       "0.0.0.0",
+		"LISTENHOST":       extListenHost,
 		"UPSTREAMHOST":     super.ListenHost,
 		"SSLCERT":          filepath.Join(super.tempdir, "server.crt"),
 		"SSLKEY":           filepath.Join(super.tempdir, "server.key"),

commit 1533034e5ef86ce3f3696a42d390c21bd546dab6
Author: Tom Clegg <tom at curii.com>
Date:   Thu Jul 14 00:22:36 2022 -0400

    16552: Fix deprecated bundler usage.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/boot/passenger.go b/lib/boot/passenger.go
index f86f1f930..e0eec5ee4 100644
--- a/lib/boot/passenger.go
+++ b/lib/boot/passenger.go
@@ -92,7 +92,11 @@ func (runner installPassenger) Run(ctx context.Context, fail func(error), super
 			break
 		}
 	}
-	err = super.RunProgram(ctx, appdir, runOptions{}, "bundle", "install", "--jobs", "4", "--path", filepath.Join(os.Getenv("HOME"), ".gem"))
+	err = super.RunProgram(ctx, appdir, runOptions{}, "bundle", "config", "--set", "local", "path", filepath.Join(os.Getenv("HOME"), ".gem"))
+	if err != nil {
+		return err
+	}
+	err = super.RunProgram(ctx, appdir, runOptions{}, "bundle", "install", "--jobs", "4")
 	if err != nil {
 		return err
 	}

-----------------------------------------------------------------------


hooks/post-receive
--