From b660e9b929f79fc567788ad7282d3ca564718c3c Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Tue, 9 Aug 2022 11:18:05 -0400 Subject: [PATCH] 19368: Skip regenerating manifest during webdav/s3 logging. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- sdk/go/arvados/fs_collection.go | 11 +++++++++++ services/keep-web/handler.go | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/sdk/go/arvados/fs_collection.go b/sdk/go/arvados/fs_collection.go index 26012e2406..eb3e974ede 100644 --- a/sdk/go/arvados/fs_collection.go +++ b/sdk/go/arvados/fs_collection.go @@ -954,6 +954,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 1f1f509860..a6187043bd 100644 --- a/services/keep-web/handler.go +++ b/services/keep-web/handler.go @@ -962,7 +962,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() -- 2.30.2