forked from TrueCloudLab/frostfs-node
[#645] client/cache: Use public key for cache key calculation
Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
parent
312e356a75
commit
78e4a87dca
1 changed files with 5 additions and 4 deletions
9
pkg/network/cache/client.go
vendored
9
pkg/network/cache/client.go
vendored
|
@ -1,6 +1,7 @@
|
|||
package cache
|
||||
|
||||
import (
|
||||
"encoding/hex"
|
||||
"sync"
|
||||
|
||||
"github.com/nspcc-dev/neofs-api-go/pkg/client"
|
||||
|
@ -40,10 +41,10 @@ func (c *ClientCache) Get(info clientcore.NodeInfo) (client.Client, error) {
|
|||
// but network.StringifyGroup is order-dependent.
|
||||
// This works until the same mixed group is transmitted
|
||||
// (for a network map, it seems to be true).
|
||||
mAddr := network.StringifyGroup(netAddr)
|
||||
cacheKey := hex.EncodeToString(info.PublicKey()) + network.StringifyGroup(netAddr)
|
||||
|
||||
c.mu.RLock()
|
||||
if cli, ok := c.clients[mAddr]; ok {
|
||||
if cli, ok := c.clients[cacheKey]; ok {
|
||||
// todo: check underlying connection neofs-api-go#196
|
||||
c.mu.RUnlock()
|
||||
|
||||
|
@ -57,13 +58,13 @@ func (c *ClientCache) Get(info clientcore.NodeInfo) (client.Client, error) {
|
|||
|
||||
// check once again if client is missing in cache, concurrent routine could
|
||||
// create client while this routine was locked on `c.mu.Lock()`.
|
||||
if cli, ok := c.clients[mAddr]; ok {
|
||||
if cli, ok := c.clients[cacheKey]; ok {
|
||||
return cli, nil
|
||||
}
|
||||
|
||||
cli := newMultiClient(netAddr, c.opts)
|
||||
|
||||
c.clients[mAddr] = cli
|
||||
c.clients[cacheKey] = cli
|
||||
|
||||
return cli, nil
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue