Skip to content

fix(decomposedfs): tolerate a space root with an unset name attribute #713

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
michaelstingl wants to merge 1 commit into from
Closed

fix(decomposedfs): tolerate a space root with an unset name attribute #713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions pkg/storage/pkg/decomposedfs/node/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,8 +422,14 @@ func readNode(ctx context.Context, lu PathLookup, spaceID, nodeID, internalPath
spaceRoot.Exists = true

// lookup name in extended attributes
spaceRoot.Name, err = spaceRoot.XattrString(ctx, prefixes.NameAttr)
if err != nil {
var name string
name, err = spaceRoot.XattrString(ctx, prefixes.NameAttr)
switch {
case err == nil:
spaceRoot.Name = name
case metadata.IsAttrUnset(err):
// ignore
default:
return nil, err
}
}
Expand Down
16 changes: 16 additions & 0 deletions pkg/storage/pkg/decomposedfs/node/node_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
. "github.com/onsi/gomega"
ocsconv "github.com/opencloud-eu/reva/v2/pkg/conversions"
ctxpkg "github.com/opencloud-eu/reva/v2/pkg/ctx"
"github.com/opencloud-eu/reva/v2/pkg/storage/pkg/decomposedfs/metadata/prefixes"
"github.com/opencloud-eu/reva/v2/pkg/storage/pkg/decomposedfs/node"
helpers "github.com/opencloud-eu/reva/v2/pkg/storage/pkg/decomposedfs/testhelpers"
"github.com/opencloud-eu/reva/v2/pkg/storage/utils/grants"
Expand Down Expand Up @@ -81,6 +82,21 @@ var _ = Describe("Node", func() {
Expect(err).ToNot(HaveOccurred())
Expect(n.BlobID).To(Equal("file1-blobid"))
})

It("treats a space root with an unset name attribute as nameless instead of failing", func() {
spaceRoot, err := env.Lookup.NodeFromSpaceID(env.Ctx, env.SpaceRootRes.SpaceId)
Expect(err).ToNot(HaveOccurred())

// simulate a half-deleted space root whose name attribute is gone
err = spaceRoot.RemoveXattr(env.Ctx, prefixes.NameAttr, true)
Expect(err).ToNot(HaveOccurred())

n, err := node.ReadNode(env.Ctx, env.Lookup, spaceRoot.SpaceID, spaceRoot.ID, "", false, nil, false)
Expect(err).ToNot(HaveOccurred())
Expect(n).ToNot(BeNil())
Expect(n.Exists).To(BeTrue())
Expect(n.Name).To(Equal(""))
})
})

Describe("WriteMetadata", func() {
Expand Down