Skip to content
Open
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
7 changes: 1 addition & 6 deletions pkg/storage/fs/posix/posix.go
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,6 @@ func New(o *options.Options, stream events.Stream, cache, historyCache *idcache.

var lu *lookup.Lookup
switch o.MetadataBackend {
case "xattrs":
lu, err = lookup.New(metadata.NewXattrsBackend(o.FileMetadataCache), um, o, &timemanager.Manager{}, cache, historyCache, log)
if err != nil {
return nil, err
}
case "hybrid":
lu, err = lookup.New(metadata.NewHybridBackend(1024, // start offloading grants after 1KB
func(n metadata.MetadataNode) string {
Expand All @@ -150,7 +145,7 @@ func New(o *options.Options, stream events.Stream, cache, historyCache *idcache.
return nil, err
}
default:
return nil, fmt.Errorf("unknown metadata backend %s, only 'xattrs' or 'hybrid' (default) supported", o.MetadataBackend)
return nil, fmt.Errorf("unknown metadata backend %s, only 'hybrid' (default) supported", o.MetadataBackend)
}

permissionsSelector, err := pool.PermissionsSelector(o.PermissionsSVC, pool.WithTLSMode(o.PermTLSMode))
Expand Down
13 changes: 13 additions & 0 deletions pkg/storage/fs/posix/posix_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,5 +89,18 @@ var _ = Describe("Posix", func() {
_, err := posix.New(o, nil, idCache, historyCache, &zerolog.Logger{})
Expect(err).ToNot(HaveOccurred())
})

Context("with the xattrs metadata backend", func() {
BeforeEach(func() {
o.MetadataBackend = "xattrs"
})

It("rejects the configuration with an informative error", func() {
_, err := posix.New(o, nil, idCache, historyCache, &zerolog.Logger{})
Expect(err).To(HaveOccurred())
Expect(err).To(MatchError(ContainSubstring("xattrs")))
Expect(err).To(MatchError(ContainSubstring("hybrid")))
})
})
})
})
2 changes: 0 additions & 2 deletions pkg/storage/fs/posix/testhelpers/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -270,8 +270,6 @@ func NewTestEnv(config map[string]interface{}) (*TestEnv, error) {

var lu *lookup.Lookup
switch o.MetadataBackend {
case "xattrs":
lu, _ = lookup.New(metadata.NewXattrsBackend(o.FileMetadataCache), um, o, &timemanager.Manager{}, c, historyCache, &logger)
case "hybrid":
lu, _ = lookup.New(metadata.NewHybridBackend(1024,
func(n metadata.MetadataNode) string {
Expand Down
4 changes: 1 addition & 3 deletions pkg/storage/pkg/decomposedfs/decomposedfs.go
Original file line number Diff line number Diff line change
Expand Up @@ -155,12 +155,10 @@ func NewDefault(m map[string]interface{}, bs node.Blobstore, es events.Stream, l

var lu *lookup.Lookup
switch o.MetadataBackend {
case "xattrs":
lu = lookup.New(metadata.NewXattrsBackend(o.FileMetadataCache), o, &timemanager.Manager{})
case "messagepack":
lu = lookup.New(metadata.NewMessagePackBackend(o.FileMetadataCache), o, &timemanager.Manager{})
default:
return nil, fmt.Errorf("unknown metadata backend %s, only 'messagepack' or 'xattrs' (default) supported", o.MetadataBackend)
return nil, fmt.Errorf("unknown metadata backend %s, only 'messagepack' (default) supported", o.MetadataBackend)
}

permissionsSelector, err := pool.PermissionsSelector(o.PermissionsSVC, pool.WithTLSMode(o.PermTLSMode))
Expand Down
11 changes: 11 additions & 0 deletions pkg/storage/pkg/decomposedfs/decomposedfs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,17 @@ var _ = Describe("Decomposed", func() {
}, bs, nil, nil)
Expect(err).ToNot(HaveOccurred())
})

It("rejects the xattrs metadata backend", func() {
bs := &nodemocks.Blobstore{}
_, err := decomposedfs.NewDefault(map[string]interface{}{
"root": env.Root,
"permissionssvc": "any",
"metadata_backend": "xattrs",
}, bs, nil, nil)
Expect(err).To(MatchError(ContainSubstring("xattrs")))
Expect(err).To(MatchError(ContainSubstring("messagepack")))
})
})

Describe("CreateDir", func() {
Expand Down
318 changes: 0 additions & 318 deletions pkg/storage/pkg/decomposedfs/metadata/xattrs_backend.go

This file was deleted.

Loading