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

[#607] placement: Work with AddressGroup

Browse source 
Make `PlacementBuilder` implementations to work `network.AddressGroup` type.

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2021-06-22 18:27:25 +03:00 committed by Leonard Lyubich
parent b3dd9a3254
commit 9033cf5aa1
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkg/services/object/util/placement.go
View file

@ -50,15 +50,15 @@ func (p *localPlacement) BuildPlacement(addr *object.Address, policy *netmapSDK.
for i := range vs { for i := range vs {
for j := range vs[i] { for j := range vs[i] {
var addr network.Address var addr network.AddressGroup
err := addr.FromString(vs[i][j].Address()) err := addr.FromIterator(vs[i][j])
if err != nil { if err != nil {
// TODO: log error // TODO: log error
continue continue
} }
if network.IsLocalAddress(p.localAddrSrc, network.GroupFromAddress(addr)) { if network.IsLocalAddress(p.localAddrSrc, addr) {
return []netmapSDK.Nodes{{vs[i][j]}}, nil return []netmapSDK.Nodes{{vs[i][j]}}, nil
} }
} }
@ -84,15 +84,15 @@ func (p *remotePlacement) BuildPlacement(addr *object.Address, policy *netmapSDK
for i := range vs { for i := range vs {
for j := 0; j < len(vs[i]); j++ { for j := 0; j < len(vs[i]); j++ {
var addr network.Address var addr network.AddressGroup
err := addr.FromString(vs[i][j].Address()) err := addr.FromIterator(vs[i][j])
if err != nil { if err != nil {
// TODO: log error // TODO: log error
continue continue
} }
if network.IsLocalAddress(p.localAddrSrc, network.GroupFromAddress(addr)) { if network.IsLocalAddress(p.localAddrSrc, addr) {
vs[i] = append(vs[i][:j], vs[i][j+1:]...) vs[i] = append(vs[i][:j], vs[i][j+1:]...)
j-- j--
} }