[arvados] updated: 2.1.0-2925-g6289b570a

[git repository hosting]

Summary of changes:
 services/keep-web/s3.go          | 5 +++++
 services/keep-web/server_test.go | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

       via  6289b570a8eb6aea964c14c8e8c5bf11443f726d (commit)
       via  08e0784f8dea70c66d21933df198bd1539355071 (commit)
      from  573362771278b2ea5c532857d050151d3ce9c060 (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 6289b570a8eb6aea964c14c8e8c5bf11443f726d
Author: Tom Clegg <tom at curii.com>
Date:   Wed Sep 21 09:28:52 2022 -0400

    19362: Update size test.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/services/keep-web/server_test.go b/services/keep-web/server_test.go
index 30f755e1f..2aa110455 100644
--- a/services/keep-web/server_test.go
+++ b/services/keep-web/server_test.go
@@ -476,7 +476,7 @@ func (s *IntegrationSuite) TestMetrics(c *check.C) {
 	c.Check(summaries["request_duration_seconds/get/200"].SampleCount, check.Equals, "3")
 	c.Check(summaries["request_duration_seconds/get/404"].SampleCount, check.Equals, "1")
 	c.Check(summaries["time_to_status_seconds/get/404"].SampleCount, check.Equals, "1")
-	c.Check(gauges["arvados_keepweb_sessions_cached_session_bytes//"].Value, check.Equals, float64(384))
+	c.Check(gauges["arvados_keepweb_sessions_cached_session_bytes//"].Value, check.Equals, float64(469))
 
 	// If the Host header indicates a collection, /metrics.json
 	// refers to a file in the collection -- the metrics handler

commit 08e0784f8dea70c66d21933df198bd1539355071
Author: Tom Clegg <tom at curii.com>
Date:   Tue Sep 20 16:45:22 2022 -0400

    19362: Fix unchecked error.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/services/keep-web/s3.go b/services/keep-web/s3.go
index 3c7c2db37..f98efd8fd 100644
--- a/services/keep-web/s3.go
+++ b/services/keep-web/s3.go
@@ -581,6 +581,8 @@ func (h *handler) serveS3(w http.ResponseWriter, r *http.Request) bool {
 	}
 }
 
+// Save modifications to the indicated collection in srcfs, then (if
+// successful) ensure they are also reflected in dstfs.
 func (h *handler) syncCollection(srcfs, dstfs arvados.CustomFileSystem, path string) error {
 	coll, _ := h.determineCollection(srcfs, path)
 	if coll == nil || coll.UUID == "" {
@@ -592,6 +594,9 @@ func (h *handler) syncCollection(srcfs, dstfs arvados.CustomFileSystem, path str
 	}
 	defer d.Close()
 	err = d.Sync()
+	if err != nil {
+		return err
+	}
 	snap, err := d.Snapshot()
 	if err != nil {
 		return err

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


hooks/post-receive
--