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

[#607] network: Do not use Address.String for address comparison

Browse source 
Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2021-06-16 15:03:11 +03:00 committed by Leonard Lyubich
parent dd67e2b690
commit e5504c7130
6 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cmd/neofs-node/container.go
View file

@ -218,16 +218,16 @@ func (r *remoteLoadAnnounceProvider) InitRemote(srv loadroute.ServerInfo) (loadc
addr := srv.Address() addr := srv.Address()
if r.loadAddrSrc.LocalAddress().String() == srv.Address() {
// if local => return no-op writer
return loadcontroller.SimpleWriterProvider(new(nopLoadWriter)), nil
}
netAddr, err := network.AddressFromString(addr) netAddr, err := network.AddressFromString(addr)
if err != nil { if err != nil {
return nil, fmt.Errorf("could not convert address to IP format: %w", err) return nil, fmt.Errorf("could not convert address to IP format: %w", err)
} }
if network.IsLocalAddress(r.loadAddrSrc, *netAddr) {
// if local => return no-op writer
return loadcontroller.SimpleWriterProvider(new(nopLoadWriter)), nil
}
c, err := r.clientCache.Get(netAddr) c, err := r.clientCache.Get(netAddr)
if err != nil { if err != nil {
return nil, fmt.Errorf("could not initialize API client: %w", err) return nil, fmt.Errorf("could not initialize API client: %w", err)

10
cmd/neofs-node/reputation/common/remote.go
View file

@ -72,16 +72,16 @@ func (rtp *remoteTrustProvider) InitRemote(srv reputationcommon.ServerInfo) (rep
addr := srv.Address() addr := srv.Address()
if rtp.localAddrSrc.LocalAddress().String() == srv.Address() {
// if local => return no-op writer
return trustcontroller.SimpleWriterProvider(new(NopReputationWriter)), nil
}
netAddr, err := network.AddressFromString(addr) netAddr, err := network.AddressFromString(addr)
if err != nil { if err != nil {
return nil, fmt.Errorf("could not convert address to IP format: %w", err) return nil, fmt.Errorf("could not convert address to IP format: %w", err)
} }
if network.IsLocalAddress(rtp.localAddrSrc, *netAddr) {
// if local => return no-op writer
return trustcontroller.SimpleWriterProvider(new(NopReputationWriter)), nil
}
c, err := rtp.clientCache.Get(netAddr) c, err := rtp.clientCache.Get(netAddr)
if err != nil { if err != nil {
return nil, fmt.Errorf("could not initialize API client: %w", err) return nil, fmt.Errorf("could not initialize API client: %w", err)

2
pkg/innerring/rpc.go
View file

@ -87,7 +87,7 @@ func (c *ClientCache) getSG(ctx context.Context, addr *object.Address, nm *netma
cli, err := c.Get(netAddr) cli, err := c.Get(netAddr)
if err != nil { if err != nil {
c.log.Warn("can't setup remote connection", c.log.Warn("can't setup remote connection",
zap.String("address", netAddr.String()), zap.Stringer("address", netAddr),
zap.String("error", err.Error())) zap.String("error", err.Error()))
continue continue

2
pkg/network/address.go
View file

@ -27,7 +27,7 @@ type LocalAddressSource interface {
LocalAddress() *Address LocalAddress() *Address
} }
// String returns multiaddr string // String returns multiaddr string.
func (a Address) String() string { func (a Address) String() string {
return a.ma.String() return a.ma.String()
} }

5
pkg/network/tls_test.go
View file

@ -43,6 +43,9 @@ func TestAddress_AddTLS(t *testing.T) {
addr.AddTLS() addr.AddTLS()
require.Equal(t, test.want, addr.String(), test.input) netAddr, err := AddressFromString(test.want)
require.NoError(t, err)
require.True(t, netAddr.Equal(addr), test.input)
} }
} }

10
pkg/services/object_manager/placement/traverser_test.go
View file

@ -65,6 +65,12 @@ func testPlacement(t *testing.T, ss, rs []int) ([]netmap.Nodes, *container.Conta
return nodes, container.New(container.WithPolicy(policy)) return nodes, container.New(container.WithPolicy(policy))
} }
func assertSameAddress(t *testing.T, ni *netmap.NodeInfo, addr *network.Address) {
netAddr, err := network.AddressFromString(ni.Address())
require.NoError(t, err)
require.True(t, netAddr.Equal(*addr))
}
func TestTraverserObjectScenarios(t *testing.T) { func TestTraverserObjectScenarios(t *testing.T) {
t.Run("search scenario", func(t *testing.T) { t.Run("search scenario", func(t *testing.T) {
selectors := []int{2, 3} selectors := []int{2, 3}
@ -87,7 +93,7 @@ func TestTraverserObjectScenarios(t *testing.T) {
require.Len(t, addrs, len(nodes[i])) require.Len(t, addrs, len(nodes[i]))
for j, n := range nodes[i] { for j, n := range nodes[i] {
require.Equal(t, n.Address(), addrs[j].String()) assertSameAddress(t, n.NodeInfo, addrs[j])
} }
} }
@ -142,7 +148,7 @@ func TestTraverserObjectScenarios(t *testing.T) {
require.Len(t, addrs, replicas[curVector]) require.Len(t, addrs, replicas[curVector])
for j := range addrs { for j := range addrs {
require.Equal(t, nodes[curVector][i+j].Address(), addrs[j].String()) assertSameAddress(t, nodes[curVector][i+j].NodeInfo, addrs[j])
} }
} }