[arvados] created: 2.7.0-6259-gdefaae08f2

[git repository hosting]

        at  defaae08f226bb9efbb76a0e15d392f46e929479 (commit)


commit defaae08f226bb9efbb76a0e15d392f46e929479
Author: Tom Clegg <tom at curii.com>
Date:   Thu Mar 28 10:57:44 2024 -0400

    21598: Don't run trash workers in container-local keepstore.
    
    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 bde13424dd..556a3bfe13 100644
--- a/lib/crunchrun/crunchrun.go
+++ b/lib/crunchrun/crunchrun.go
@@ -2256,9 +2256,14 @@ func startLocalKeepstore(configData ConfigData, logbuf io.Writer) (*exec.Cmd, er
 	}
 
 	// Rather than have an alternate way to tell keepstore how
-	// many buffers to use when starting it this way, we just
-	// modify the cluster configuration that we feed it on stdin.
-	configData.Cluster.API.MaxKeepBlobBuffers = configData.KeepBuffers
+	// many buffers to use, etc., when starting it this way, we
+	// just modify the cluster configuration that we feed it on
+	// stdin.
+	ccfg := *configData.Cluster
+	ccfg.API.MaxKeepBlobBuffers = configData.KeepBuffers
+	ccfg.Collections.BlobTrash = false
+	ccfg.Collections.BlobTrashConcurrency = 0
+	ccfg.Collections.BlobDeleteConcurrency = 0
 
 	localaddr := localKeepstoreAddr()
 	ln, err := net.Listen("tcp", net.JoinHostPort(localaddr, "0"))
@@ -2278,7 +2283,7 @@ func startLocalKeepstore(configData ConfigData, logbuf io.Writer) (*exec.Cmd, er
 	var confJSON bytes.Buffer
 	err = json.NewEncoder(&confJSON).Encode(arvados.Config{
 		Clusters: map[string]arvados.Cluster{
-			configData.Cluster.ClusterID: *configData.Cluster,
+			ccfg.ClusterID: ccfg,
 		},
 	})
 	if err != nil {
diff --git a/lib/crunchrun/integration_test.go b/lib/crunchrun/integration_test.go
index 4f0100b267..ef5cc567db 100644
--- a/lib/crunchrun/integration_test.go
+++ b/lib/crunchrun/integration_test.go
@@ -221,6 +221,8 @@ func (s *integrationSuite) TestRunTrivialContainerWithLocalKeepstore(c *C) {
 		if trial.logConfig == "none" {
 			c.Check(logExists, Equals, false)
 		} else {
+			c.Check(log, Matches, `(?ms).*not running trash worker.*`)
+			c.Check(log, Matches, `(?ms).*not running trash emptier.*`)
 			c.Check(log, trial.matchGetReq, `(?ms).*"reqMethod":"GET".*`)
 			c.Check(log, trial.matchPutReq, `(?ms).*"reqMethod":"PUT".*,"reqPath":"0e3bcff26d51c895a60ea0d4585e134d".*`)
 		}

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


hooks/post-receive
--