[arvados] updated: 2.4.2-27-g6e992b73b

[git repository hosting]

Summary of changes:
 lib/crunchrun/crunchrun.go        | 46 +++++++++++++++++++++++++++++++++++++--
 lib/crunchrun/integration_test.go |  7 +++++-
 2 files changed, 50 insertions(+), 3 deletions(-)

       via  6e992b73bf60a23b2ca10ca9694e5dff4d1497cc (commit)
      from  c5279947a9a418c60db2ff9364e63aed024181eb (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 6e992b73bf60a23b2ca10ca9694e5dff4d1497cc
Author: Tom Clegg <tom at curii.com>
Date:   Mon Sep 19 15:18:17 2022 -0400

    19277: cherry-pick '19277-local-keep-from-ctr' to 2.4-staging
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/crunchrun/crunchrun.go b/lib/crunchrun/crunchrun.go
index 30871e734..19d24cc84 100644
--- a/lib/crunchrun/crunchrun.go
+++ b/lib/crunchrun/crunchrun.go
@@ -999,6 +999,7 @@ func (runner *ContainerRunner) CreateContainer(imageID string, bindmounts map[st
 		env["ARVADOS_API_TOKEN"] = tok
 		env["ARVADOS_API_HOST"] = os.Getenv("ARVADOS_API_HOST")
 		env["ARVADOS_API_HOST_INSECURE"] = os.Getenv("ARVADOS_API_HOST_INSECURE")
+		env["ARVADOS_KEEP_SERVICES"] = os.Getenv("ARVADOS_KEEP_SERVICES")
 	}
 	workdir := runner.Container.Cwd
 	if workdir == "." {
@@ -2040,7 +2041,8 @@ func startLocalKeepstore(configData ConfigData, logbuf io.Writer) (*exec.Cmd, er
 	// modify the cluster configuration that we feed it on stdin.
 	configData.Cluster.API.MaxKeepBlobBuffers = configData.KeepBuffers
 
-	ln, err := net.Listen("tcp", "localhost:0")
+	localaddr := localKeepstoreAddr()
+	ln, err := net.Listen("tcp", net.JoinHostPort(localaddr, "0"))
 	if err != nil {
 		return nil, err
 	}
@@ -2050,7 +2052,7 @@ func startLocalKeepstore(configData ConfigData, logbuf io.Writer) (*exec.Cmd, er
 		return nil, err
 	}
 	ln.Close()
-	url := "http://localhost:" + port
+	url := "http://" + net.JoinHostPort(localaddr, port)
 
 	fmt.Fprintf(logbuf, "starting keepstore on %s\n", url)
 
@@ -2142,3 +2144,43 @@ func currentUserAndGroups() string {
 	}
 	return s
 }
+
+// Return a suitable local interface address for a local keepstore
+// service. Currently this is the numerically lowest non-loopback ipv4
+// address assigned to a local interface that is not in any of the
+// link-local/vpn/loopback ranges 169.254/16, 100.64/10, or 127/8.
+func localKeepstoreAddr() string {
+	var ips []net.IP
+	// Ignore error (proceed with zero IPs)
+	addrs, _ := processIPs(os.Getpid())
+	for addr := range addrs {
+		ip := net.ParseIP(addr)
+		if ip == nil {
+			// invalid
+			continue
+		}
+		if ip.Mask(net.CIDRMask(8, 32)).Equal(net.IPv4(127, 0, 0, 0)) ||
+			ip.Mask(net.CIDRMask(10, 32)).Equal(net.IPv4(100, 64, 0, 0)) ||
+			ip.Mask(net.CIDRMask(16, 32)).Equal(net.IPv4(169, 254, 0, 0)) {
+			// unsuitable
+			continue
+		}
+		ips = append(ips, ip)
+	}
+	if len(ips) == 0 {
+		return "0.0.0.0"
+	}
+	sort.Slice(ips, func(ii, jj int) bool {
+		i, j := ips[ii], ips[jj]
+		if len(i) != len(j) {
+			return len(i) < len(j)
+		}
+		for x := range i {
+			if i[x] != j[x] {
+				return i[x] < j[x]
+			}
+		}
+		return false
+	})
+	return ips[0].String()
+}
diff --git a/lib/crunchrun/integration_test.go b/lib/crunchrun/integration_test.go
index 2ba7556cb..37904338c 100644
--- a/lib/crunchrun/integration_test.go
+++ b/lib/crunchrun/integration_test.go
@@ -214,6 +214,11 @@ func (s *integrationSuite) TestRunTrivialContainerWithLocalKeepstore(c *C) {
 			c.Check(log, trial.matchGetReq, `(?ms).*"reqMethod":"GET".*`)
 			c.Check(log, trial.matchPutReq, `(?ms).*"reqMethod":"PUT".*,"reqPath":"0e3bcff26d51c895a60ea0d4585e134d".*`)
 		}
+
+		c.Check(s.logFiles["crunch-run.txt"], Matches, `(?ms).*using local keepstore process .* at http://[\d\.]{7,}:\d+.*`)
+		c.Check(s.logFiles["crunch-run.txt"], Not(Matches), `(?ms).* at http://127\..*`)
+		c.Check(s.logFiles["crunch-run.txt"], Not(Matches), `(?ms).* at http://169\.254\..*`)
+		c.Check(s.logFiles["stderr.txt"], Matches, `(?ms).*ARVADOS_KEEP_SERVICES=http://[\d\.]{7,}:\d+\n.*`)
 	}
 
 	// Check that (1) config is loaded from $ARVADOS_CONFIG when
@@ -252,7 +257,7 @@ func (s *integrationSuite) testRunTrivialContainer(c *C) {
 	if s.engine == "docker" && os.Getenv("ENABLE_DOCKER_TESTS") == "" {
 		c.Skip("docker tests temporarily disabled if ENABLE_DOCKER_TESTS is not set, see https://dev.arvados.org/issues/15370#note-31")
 	}
-	s.cr.Command = []string{"sh", "-c", "cat /mnt/in/inputfile >/mnt/out/inputfile && cat /mnt/json >/mnt/out/json && ! touch /mnt/in/shouldbereadonly && mkdir /mnt/out/emptydir"}
+	s.cr.Command = []string{"sh", "-c", "env >&2 && cat /mnt/in/inputfile >/mnt/out/inputfile && cat /mnt/json >/mnt/out/json && ! touch /mnt/in/shouldbereadonly && mkdir /mnt/out/emptydir"}
 	s.setup(c)
 
 	args := []string{

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


hooks/post-receive
--