dstepanov-yadro/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#645] object/put: Pass NodeInfo instead of AddressGroup to relay func

Browse source 
Replace `network.AddressGroup` parameter type of relay function with
`client.NodeInfo`.

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2021-09-28 08:36:41 +03:00 committed by Alex Vanin
parent e473f3ac91
commit 3a497a3c53
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkg/services/object/put/prm.go
View file

@ -3,7 +3,6 @@ package putsvc
import ( import (
"github.com/nspcc-dev/neofs-node/pkg/core/client" "github.com/nspcc-dev/neofs-node/pkg/core/client"
"github.com/nspcc-dev/neofs-node/pkg/core/object" "github.com/nspcc-dev/neofs-node/pkg/core/object"
"github.com/nspcc-dev/neofs-node/pkg/network"
"github.com/nspcc-dev/neofs-node/pkg/services/object/util" "github.com/nspcc-dev/neofs-node/pkg/services/object/util"
"github.com/nspcc-dev/neofs-node/pkg/services/object_manager/placement" "github.com/nspcc-dev/neofs-node/pkg/services/object_manager/placement"
) )
@ -15,7 +14,7 @@ type PutInitPrm struct {
traverseOpts []placement.Option traverseOpts []placement.Option
relay func(network.AddressGroup, client.Client) error relay func(client.NodeInfo, client.Client) error
} }
type PutChunkPrm struct { type PutChunkPrm struct {
@ -46,7 +45,7 @@ func (p *PutInitPrm) WithObject(v *object.RawObject) *PutInitPrm {
return p return p
} }
func (p *PutInitPrm) WithRelay(f func(network.AddressGroup, client.Client) error) *PutInitPrm { func (p *PutInitPrm) WithRelay(f func(client.NodeInfo, client.Client) error) *PutInitPrm {
if p != nil { if p != nil {
p.relay = f p.relay = f
} }

5
pkg/services/object/put/streamer.go
View file

@ -7,7 +7,6 @@ import (
"github.com/nspcc-dev/neofs-node/pkg/core/client" "github.com/nspcc-dev/neofs-node/pkg/core/client"
"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/network"
"github.com/nspcc-dev/neofs-node/pkg/services/object/util" "github.com/nspcc-dev/neofs-node/pkg/services/object/util"
"github.com/nspcc-dev/neofs-node/pkg/services/object_manager/placement" "github.com/nspcc-dev/neofs-node/pkg/services/object_manager/placement"
"github.com/nspcc-dev/neofs-node/pkg/services/object_manager/transformer" "github.com/nspcc-dev/neofs-node/pkg/services/object_manager/transformer"
@ -20,7 +19,7 @@ type Streamer struct {
target transformer.ObjectTarget target transformer.ObjectTarget
relay func(network.AddressGroup, client.Client) error relay func(client.NodeInfo, client.Client) error
maxPayloadSz uint64 // network config maxPayloadSz uint64 // network config
} }
@ -157,7 +156,7 @@ func (p *Streamer) newCommonTarget(prm *PutInitPrm) transformer.ObjectTarget {
return fmt.Errorf("could not create SDK client %s: %w", info.AddressGroup(), err) return fmt.Errorf("could not create SDK client %s: %w", info.AddressGroup(), err)
} }
return p.relay(info.AddressGroup(), c) return p.relay(info, c)
} }
} }

4
pkg/services/object/put/v2/streamer.go
View file

@ -125,13 +125,13 @@ func (s *streamer) CloseAndRecv() (*object.PutResponse, error) {
return fromPutResponse(resp), nil return fromPutResponse(resp), nil
} }
func (s *streamer) relayRequest(addr network.AddressGroup, c client.Client) error { func (s *streamer) relayRequest(info client.NodeInfo, c client.Client) error {
// open stream // open stream
resp := new(object.PutResponse) resp := new(object.PutResponse)
var firstErr error var firstErr error
addr.IterateAddresses(func(addr network.Address) (stop bool) { info.AddressGroup().IterateAddresses(func(addr network.Address) (stop bool) {
var err error var err error
defer func() { defer func() {