Skip to content
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

Fix the space id in the decomposedFS storageSpaceFromNode #3836

Merged
merged 1 commit into from
May 15, 2023
Merged

Fix the space id in the decomposedFS storageSpaceFromNode #3836

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
5 changes: 5 additions & 0 deletions changelog/unreleased/fix-spaceid-node.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Bugfix: Fix spaceID in the decomposedFS

We returned the wrong spaceID within ``storageSpaceFromNode``. This was fixed and the storageprovider ID handling refactored.

https://github.com/cs3org/reva/pull/3836
48 changes: 16 additions & 32 deletions internal/grpc/services/storageprovider/storageprovider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,10 +282,7 @@ func (s *service) InitiateFileDownload(ctx context.Context, req *provider.Initia
protocol := &provider.FileDownloadProtocol{Expose: s.conf.ExposeDataServer}

if utils.IsRelativeReference(req.Ref) {
// fill in storage provider id if it is missing
if req.GetRef().GetResourceId().GetStorageId() == "" {
req.GetRef().GetResourceId().StorageId = s.conf.MountID
}
s.addMissingStorageProviderID(req.GetRef().GetResourceId(), nil)
protocol.Protocol = "spaces"
u.Path = path.Join(u.Path, "spaces", storagespace.FormatResourceID(*req.Ref.ResourceId), req.Ref.Path)
} else {
Expand Down Expand Up @@ -517,9 +514,7 @@ func (s *service) CreateStorageSpace(ctx context.Context, req *provider.CreateSt
}, nil
}

if resp.StorageSpace != nil {
s.addMissingStorageProviderID(resp.StorageSpace.Root, resp.StorageSpace.Id)
}
s.addMissingStorageProviderID(resp.GetStorageSpace().GetRoot(), resp.GetStorageSpace().GetId())
return resp, nil
}

Expand Down Expand Up @@ -563,7 +558,7 @@ func (s *service) ListStorageSpaces(ctx context.Context, req *provider.ListStora
continue
}

s.addMissingStorageProviderID(sp.Root, sp.Id)
s.addMissingStorageProviderID(sp.GetRoot(), sp.GetId())
}

return &provider.ListStorageSpacesResponse{
Expand All @@ -582,9 +577,7 @@ func (s *service) UpdateStorageSpace(ctx context.Context, req *provider.UpdateSt
Msg("failed to update storage space")
return nil, err
}
if res.StorageSpace != nil {
s.addMissingStorageProviderID(res.StorageSpace.Root, res.StorageSpace.Id)
}
s.addMissingStorageProviderID(res.GetStorageSpace().GetRoot(), res.GetStorageSpace().GetId())
return res, nil
}

Expand Down Expand Up @@ -744,15 +737,9 @@ func (s *service) Stat(ctx context.Context, req *provider.StatRequest) (*provide
}, nil
}

// The storage driver might set the mount ID by itself, in which case skip this step
if md.Id.GetStorageId() == "" {
md.Id.StorageId = s.conf.MountID
}

// The storage driver might set the mount ID by itself, in which case skip this step
if md.ParentId != nil && md.ParentId.GetStorageId() == "" {
md.ParentId.StorageId = s.conf.MountID
}
s.addMissingStorageProviderID(md.GetId(), nil)
s.addMissingStorageProviderID(md.GetParentId(), nil)
s.addMissingStorageProviderID(md.GetSpace().GetRoot(), nil)

return &provider.StatResponse{
Status: status.NewOK(ctx),
Expand Down Expand Up @@ -791,7 +778,9 @@ func (s *service) ListContainerStream(req *provider.ListContainerStreamRequest,
}

for _, md := range mds {
s.addMissingStorageProviderID(md.Id, nil)
s.addMissingStorageProviderID(md.GetId(), nil)
s.addMissingStorageProviderID(md.GetParentId(), nil)
s.addMissingStorageProviderID(md.GetSpace().GetRoot(), nil)
res := &provider.ListContainerStreamResponse{
Info: md,
Status: status.NewOK(ctx),
Expand All @@ -816,10 +805,9 @@ func (s *service) ListContainer(ctx context.Context, req *provider.ListContainer
}

for _, i := range res.Infos {
s.addMissingStorageProviderID(i.Id, nil)
if i.ParentId != nil {
s.addMissingStorageProviderID(i.ParentId, nil)
}
s.addMissingStorageProviderID(i.GetId(), nil)
s.addMissingStorageProviderID(i.GetParentId(), nil)
s.addMissingStorageProviderID(i.GetSpace().GetRoot(), nil)
}
return res, nil
}
Expand Down Expand Up @@ -879,9 +867,7 @@ func (s *service) ListRecycleStream(req *provider.ListRecycleStreamRequest, ss p

// TODO(labkode): CRITICAL: fill recycle info with storage provider.
for _, item := range items {
if item.Ref != nil && item.Ref.ResourceId != nil {
s.addMissingStorageProviderID(item.Ref.GetResourceId(), nil)
}
s.addMissingStorageProviderID(item.GetRef().GetResourceId(), nil)
res := &provider.ListRecycleStreamResponse{
RecycleItem: item,
Status: status.NewOK(ctx),
Expand Down Expand Up @@ -920,9 +906,7 @@ func (s *service) ListRecycle(ctx context.Context, req *provider.ListRecycleRequ
}

for _, i := range items {
if i.Ref != nil && i.Ref.ResourceId != nil {
s.addMissingStorageProviderID(i.Ref.GetResourceId(), nil)
}
s.addMissingStorageProviderID(i.GetRef().GetResourceId(), nil)
}
res := &provider.ListRecycleResponse{
Status: status.NewOK(ctx),
Expand Down Expand Up @@ -1220,7 +1204,7 @@ func (s *service) GetQuota(ctx context.Context, req *provider.GetQuotaRequest) (

func (s *service) addMissingStorageProviderID(resourceID *provider.ResourceId, spaceID *provider.StorageSpaceId) {
// The storage driver might set the mount ID by itself, in which case skip this step
if resourceID.GetStorageId() == "" {
if resourceID != nil && resourceID.GetStorageId() == "" {
resourceID.StorageId = s.conf.MountID
if spaceID != nil {
rid, _ := storagespace.ParseID(spaceID.GetOpaqueId())
Expand Down
6 changes: 3 additions & 3 deletions pkg/storage/utils/decomposedfs/spaces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -897,7 +897,7 @@ func (fs *Decomposedfs) storageSpaceFromNode(ctx context.Context, n *node.Node,
&provider.Reference{
ResourceId: &provider.ResourceId{
SpaceId: n.SpaceRoot.SpaceID,
OpaqueId: n.ID},
OpaqueId: n.SpaceRoot.ID},
},
)
if err != nil {
Expand All @@ -923,7 +923,7 @@ func (fs *Decomposedfs) storageSpaceFromNode(ctx context.Context, n *node.Node,
Id: &provider.StorageSpaceId{OpaqueId: ssID},
Root: &provider.ResourceId{
SpaceId: n.SpaceRoot.SpaceID,
OpaqueId: n.ID,
OpaqueId: n.SpaceRoot.ID,
},
Name: sname,
// SpaceType is read from xattr below
Expand Down Expand Up @@ -974,7 +974,7 @@ func (fs *Decomposedfs) storageSpaceFromNode(ctx context.Context, n *node.Node,
Value: []byte(etag),
}

spaceAttributes, err := n.Xattrs()
spaceAttributes, err := n.SpaceRoot.Xattrs()
if err != nil {
return nil, err
}
Expand Down