[arvados] created: 2.1.0-2615-g265afdad1

[git repository hosting]

        at  265afdad112b129c36235935470d4a410161a9ef (commit)


commit 265afdad112b129c36235935470d4a410161a9ef
Author: Tom Clegg <tom at curii.com>
Date:   Tue Aug 9 11:18:05 2022 -0400

    19368: Skip regenerating manifest during webdav/s3 logging.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/sdk/go/arvados/fs_collection.go b/sdk/go/arvados/fs_collection.go
index ccfbdc4da..6583b8f25 100644
--- a/sdk/go/arvados/fs_collection.go
+++ b/sdk/go/arvados/fs_collection.go
@@ -953,6 +953,17 @@ func (dn *dirnode) Child(name string, replace func(inode) (inode, error)) (inode
 		gn.SetParent(dn, name)
 		return gn, nil
 	}
+	if dn == dn.fs.rootnode() && name == ".arvados#collection_id" {
+		gn := &getternode{Getter: func() ([]byte, error) {
+			data, err := json.Marshal(Collection{UUID: dn.fs.uuid})
+			if err == nil {
+				data = append(data, '\n')
+			}
+			return data, err
+		}}
+		gn.SetParent(dn, name)
+		return gn, nil
+	}
 	return dn.treenode.Child(name, replace)
 }
 
diff --git a/services/keep-web/handler.go b/services/keep-web/handler.go
index 54b8c0216..535102842 100644
--- a/services/keep-web/handler.go
+++ b/services/keep-web/handler.go
@@ -934,7 +934,7 @@ func (h *handler) determineCollection(fs arvados.CustomFileSystem, path string)
 	var i int
 	for i = 0; i < len(segments); i++ {
 		dir := append([]string{}, segments[0:i]...)
-		dir = append(dir, ".arvados#collection")
+		dir = append(dir, ".arvados#collection_id")
 		f, err := fs.OpenFile(strings.Join(dir, "/"), os.O_RDONLY, 0)
 		if f != nil {
 			defer f.Close()

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


hooks/post-receive
--