TrueCloudLab/frostfs-node
20
1
Fork 28
Code Issues 107 Pull requests 4 Projects Releases 2 Packages 4 Activity Actions

[#645] placement: Overload result of Traverser.Next method

Browse source 
In previous implementation `placement.Traverser.Next` method returned slice
of `network.AddressGroup` elements. There is a need to process keys of
storage nodes besides network addresses for intra-container communication.

Wrap `network.AddressGroup` in a new type `placement.Node` that summarizes
the storage node information required for communication. Return slice of
`Node` instances from `Traverser.Next` method. Fix compilation breaks in
dependent packages.

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2021-09-06 14:35:06 +03:00 • committed by Alex Vanin
parent 3c848b2cad
commit fe90456dcc
6 changed files with 29 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pkg/services/object/put/distributed.go
View file

@ -25,7 +25,7 @@ type distributedTarget struct {
nodeTargetInitializer func(network.AddressGroup) transformer.ObjectTarget
relay func(network.AddressGroup) error
relay func(placement.Node) error
fmt *object.FormatValidator
@ -68,15 +68,15 @@ func (t *distributedTarget) Close() (*transformer.AccessIdentifiers, error) {
return t.iteratePlacement(t.sendObject)
}
func (t *distributedTarget) sendObject(addr network.AddressGroup) error {
func (t *distributedTarget) sendObject(node placement.Node) error {
if t.relay != nil {
err := t.relay(addr)
err := t.relay(node)
if err == nil || !errors.Is(err, errLocalAddress) {
return err
}
}
target := t.nodeTargetInitializer(addr)
target := t.nodeTargetInitializer(node.Addresses())
if err := target.WriteHeader(t.obj); err != nil {
return fmt.Errorf("could not write header: %w", err)
@ -86,7 +86,7 @@ func (t *distributedTarget) sendObject(addr network.AddressGroup) error {
return nil
}
func (t *distributedTarget) iteratePlacement(f func(network.AddressGroup) error) (*transformer.AccessIdentifiers, error) {
func (t *distributedTarget) iteratePlacement(f func(placement.Node) error) (*transformer.AccessIdentifiers, error) {
traverser, err := placement.NewTraverser(
append(t.traverseOpts, placement.ForObject(t.obj.ID()))...,
)
@ -111,7 +111,7 @@ loop:
defer wg.Done()
if err := f(addr); err != nil {
svcutil.LogServiceError(t.log, "PUT", addr, err)
svcutil.LogServiceError(t.log, "PUT", addr.Addresses(), err)
return
}