Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions pkg/storage/fs/posix/tree/assimilation.go
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,10 @@ func (t *Tree) HandleFileDelete(path string, sendSSE bool) error {
t.log.Error().Err(err).Str("path", path).Msg("could not purge metadata")
}

if err = t.setDirty(filepath.Dir(path), true); err != nil {
t.log.Error().Err(err).Str("path", path).Msg("could not set dirty flag")
}

if !sendSSE {
return nil
}
Expand Down Expand Up @@ -705,6 +709,16 @@ assimilate:
attributes.SetInt64(prefixes.BlobsizeAttr, fi.Size())
attributes.SetInt64(prefixes.TypeAttr, int64(provider.ResourceType_RESOURCE_TYPE_FILE))
n = node.New(spaceID, id, parentID, filepath.Base(path), fi.Size(), blobID, provider.ResourceType_RESOURCE_TYPE_FILE, nil, t.lookup)
n.SpaceRoot = &node.Node{BaseNode: node.BaseNode{SpaceID: spaceID, ID: spaceID}}

prevBlobSize, err := previousAttribs.Int64(prefixes.BlobsizeAttr)
if err == nil && prevBlobSize != fi.Size() {
// file size changed, trigger propagation of tree size changes
err = t.Propagate(context.Background(), n, fi.Size()-prevBlobSize)
if err != nil {
t.log.Error().Err(err).Str("path", path).Msg("could not propagate tree size changes")
}
}
}
attributes.SetTime(prefixes.MTimeAttr, fi.ModTime())

Expand Down
31 changes: 29 additions & 2 deletions pkg/storage/fs/posix/tree/tree_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,13 @@ var _ = Describe("Tree", func() {
g.Expect(n.Blobsize).To(Equal(int64(0)))
oldChecksum, _ = n.Xattr(env.Ctx, prefixes.ChecksumPrefix+"adler32")
g.Expect(oldChecksum).ToNot(BeEmpty())

root, err := env.Lookup.NodeFromResource(env.Ctx, &provider.Reference{
ResourceId: env.SpaceRootRes,
Path: subtree,
})
g.Expect(err).ToNot(HaveOccurred())
g.Expect(root.GetTreeSize(env.Ctx)).To(Equal(uint64(0)))
}).ProbeEvery(200 * time.Millisecond).Should(Succeed())

// Change file content
Expand All @@ -219,12 +226,18 @@ var _ = Describe("Tree", func() {
g.Expect(n.Blobsize).To(Equal(int64(11)))
checksum, _ := n.Xattr(env.Ctx, prefixes.ChecksumPrefix+"adler32")
g.Expect(checksum).ToNot(Equal(oldChecksum))

root, err := env.Lookup.NodeFromResource(env.Ctx, &provider.Reference{
ResourceId: env.SpaceRootRes,
Path: subtree,
})
g.Expect(err).ToNot(HaveOccurred())
g.Expect(root.GetTreeSize(env.Ctx)).To(Equal(uint64(11)))
}).Should(Succeed())
})

It("handles deleted files", func() {
_, err := os.Create(root + "/deleted.txt")
Expect(err).ToNot(HaveOccurred())
Expect(os.WriteFile(root+"/deleted.txt", []byte("hello world"), 0600)).To(Succeed())

Eventually(func(g Gomega) {
n, err := env.Lookup.NodeFromResource(env.Ctx, &provider.Reference{
Expand All @@ -235,6 +248,13 @@ var _ = Describe("Tree", func() {
g.Expect(n).ToNot(BeNil())
g.Expect(n.Type(env.Ctx)).To(Equal(provider.ResourceType_RESOURCE_TYPE_FILE))
g.Expect(n.ID).ToNot(BeEmpty())

root, err := env.Lookup.NodeFromResource(env.Ctx, &provider.Reference{
ResourceId: env.SpaceRootRes,
Path: subtree,
})
g.Expect(err).ToNot(HaveOccurred())
g.Expect(root.GetTreeSize(env.Ctx)).To(Equal(uint64(11)))
}).Should(Succeed())

Expect(os.Remove(root + "/deleted.txt")).To(Succeed())
Expand All @@ -246,6 +266,13 @@ var _ = Describe("Tree", func() {
})
g.Expect(err).ToNot(HaveOccurred())
g.Expect(n.Exists).To(BeFalse())

root, err := env.Lookup.NodeFromResource(env.Ctx, &provider.Reference{
ResourceId: env.SpaceRootRes,
Path: subtree,
})
g.Expect(err).ToNot(HaveOccurred())
g.Expect(root.GetTreeSize(env.Ctx)).To(Equal(uint64(0)))
}).Should(Succeed())
})

Expand Down