[#39] service/object: Complicate Head service logic

Add a header recovery step through finding and getting the header of the
rightmost child.

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2020-09-23 13:53:59 +03:00 committed by Alex Vanin
parent 753a6a2de5
commit d6a9c06c25

View file

@ -4,13 +4,20 @@ import (
"context" "context"
"crypto/ecdsa" "crypto/ecdsa"
objectSDK "github.com/nspcc-dev/neofs-api-go/pkg/object"
"github.com/nspcc-dev/neofs-node/pkg/core/container" "github.com/nspcc-dev/neofs-node/pkg/core/container"
"github.com/nspcc-dev/neofs-node/pkg/core/netmap" "github.com/nspcc-dev/neofs-node/pkg/core/netmap"
"github.com/nspcc-dev/neofs-node/pkg/core/object"
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/localstore" "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/localstore"
"github.com/nspcc-dev/neofs-node/pkg/network" "github.com/nspcc-dev/neofs-node/pkg/network"
"github.com/nspcc-dev/neofs-node/pkg/util" "github.com/nspcc-dev/neofs-node/pkg/util"
"github.com/pkg/errors"
) )
type RelationSearcher interface {
SearchRightChild(context.Context, *objectSDK.Address) (*objectSDK.ID, error)
}
type Service struct { type Service struct {
*cfg *cfg
} }
@ -29,6 +36,8 @@ type cfg struct {
workerPool util.WorkerPool workerPool util.WorkerPool
localAddrSrc network.LocalAddressSource localAddrSrc network.LocalAddressSource
relSearcher RelationSearcher
} }
func defaultCfg() *cfg { func defaultCfg() *cfg {
@ -50,9 +59,34 @@ func NewService(opts ...Option) *Service {
} }
func (s *Service) Head(ctx context.Context, prm *Prm) (*Response, error) { func (s *Service) Head(ctx context.Context, prm *Prm) (*Response, error) {
return (&distributedHeader{ // try to receive header of physically stored
r, err := (&distributedHeader{
cfg: s.cfg, cfg: s.cfg,
}).head(ctx, prm) }).head(ctx, prm)
if err == nil || prm.local {
return r, err
}
// try to find far right child that carries header of desired object
rightChildID, err := s.relSearcher.SearchRightChild(ctx, prm.addr)
if err != nil {
return nil, errors.Wrapf(err, "(%T) could not find right child", s)
}
addr := objectSDK.NewAddress()
addr.SetContainerID(prm.addr.GetContainerID())
addr.SetObjectID(rightChildID)
rightChild, err := s.Head(ctx, new(Prm).WithAddress(addr))
if err != nil {
return nil, errors.Wrapf(err, "(%T) could not get right child header", s)
}
// TODO: check if received parent has requested address
return &Response{
hdr: object.NewFromSDK(rightChild.Header().GetParent()),
}, nil
} }
func WithKey(v *ecdsa.PrivateKey) Option { func WithKey(v *ecdsa.PrivateKey) Option {
@ -90,3 +124,9 @@ func WithLocalAddressSource(v network.LocalAddressSource) Option {
c.localAddrSrc = v c.localAddrSrc = v
} }
} }
func WithRelationSearcher(v RelationSearcher) Option {
return func(c *cfg) {
c.relSearcher = v
}
}