TrueCloudLab/frostfs-node
20
1
Fork 27
Code Issues 101 Pull requests 5 Projects Releases 1 Activity Actions

[#965] morph: Get rid of container.List invocations

Browse source 
ContainersOf() is better in almost every aspect, besides creating a
session when the containers number is between 1024 and 2048 (prefetch
script does limited unwrapping). Making List() private helps to ensure
it is no longer used and can be safely removed in future.

Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>
This commit is contained in:
Evgenii Stratonikov 2024-02-06 20:29:39 +03:00 committed by Evgenii Stratonikov
parent b1a1b2107d
commit a6c9a337cd
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmd/frostfs-node/container.go
View file

@ -210,7 +210,7 @@ type morphContainerReader struct {
src containerCore.Source src containerCore.Source
lister interface { lister interface {
List(*user.ID) ([]cid.ID, error) ContainersOf(*user.ID) ([]cid.ID, error)
} }
} }
@ -226,8 +226,8 @@ func (x *morphContainerReader) GetEACL(id cid.ID) (*containerCore.EACL, error) {
return x.eacl.GetEACL(id) return x.eacl.GetEACL(id)
} }
func (x *morphContainerReader) List(id *user.ID) ([]cid.ID, error) { func (x *morphContainerReader) ContainersOf(id *user.ID) ([]cid.ID, error) {
return x.lister.List(id) return x.lister.ContainersOf(id)
} }
type morphContainerWriter struct { type morphContainerWriter struct {

2
pkg/morph/client/container/containers_of.go
View file

@ -53,7 +53,7 @@ func (c *Client) ContainersOf(idUser *user.ID) ([]cid.ID, error) {
err := c.client.Morph().TestInvokeIterator(cb, batchSize, cnrHash, containersOfMethod, rawID) err := c.client.Morph().TestInvokeIterator(cb, batchSize, cnrHash, containersOfMethod, rawID)
if err != nil { if err != nil {
if errors.Is(err, unwrap.ErrNoSessionID) { if errors.Is(err, unwrap.ErrNoSessionID) {
return c.List(idUser) return c.list(idUser)
} }
return nil, err return nil, err
} }

4
pkg/morph/client/container/list.go
View file

@ -8,13 +8,13 @@ import (
"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user"
) )
// List returns a list of container identifiers belonging // list returns a list of container identifiers belonging
// to the specified user of FrostFS system. The list is composed // to the specified user of FrostFS system. The list is composed
// through Container contract call. // through Container contract call.
// //
// Returns the identifiers of all FrostFS containers if pointer // Returns the identifiers of all FrostFS containers if pointer
// to user identifier is nil. // to user identifier is nil.
func (c *Client) List(idUser *user.ID) ([]cid.ID, error) { func (c *Client) list(idUser *user.ID) ([]cid.ID, error) {
var rawID []byte var rawID []byte
if idUser != nil { if idUser != nil {

6
pkg/services/container/morph/executor.go
View file

@ -26,10 +26,10 @@ type Reader interface {
containercore.Source containercore.Source
containercore.EACLSource containercore.EACLSource
// List returns a list of container identifiers belonging // ContainersOf returns a list of container identifiers belonging
// to the specified user of FrostFS system. Returns the identifiers // to the specified user of FrostFS system. Returns the identifiers
// of all FrostFS containers if pointer to owner identifier is nil. // of all FrostFS containers if pointer to owner identifier is nil.
List(*user.ID) ([]cid.ID, error) ContainersOf(*user.ID) ([]cid.ID, error)
} }
// Writer is an interface of container storage updater. // Writer is an interface of container storage updater.
@ -187,7 +187,7 @@ func (s *morphExecutor) List(_ context.Context, body *container.ListRequestBody)
return nil, fmt.Errorf("invalid user ID: %w", err) return nil, fmt.Errorf("invalid user ID: %w", err)
} }
cnrs, err := s.rdr.List(&id) cnrs, err := s.rdr.ContainersOf(&id)
if err != nil { if err != nil {
return nil, err return nil, err
} }