forked from TrueCloudLab/frostfs-node
[#184] Use SDK client cache in object.Range
Signed-off-by: Alex Vanin <alexey@nspcc.ru>
This commit is contained in:
parent
d485a5967d
commit
f85e88c4f8
4 changed files with 22 additions and 10 deletions
|
@ -294,6 +294,7 @@ func initObjectService(c *cfg) {
|
|||
|
||||
sRange := rangesvc.NewService(
|
||||
rangesvc.WithKeyStorage(keyStorage),
|
||||
rangesvc.WithClientCache(clientCache),
|
||||
rangesvc.WithLocalStorage(ls),
|
||||
rangesvc.WithContainerSource(c.cfgObject.cnrStorage),
|
||||
rangesvc.WithNetworkMapSource(c.cfgObject.netMapStorage),
|
||||
|
|
|
@ -8,6 +8,7 @@ import (
|
|||
"github.com/nspcc-dev/neofs-api-go/pkg/object"
|
||||
"github.com/nspcc-dev/neofs-api-go/pkg/token"
|
||||
"github.com/nspcc-dev/neofs-node/pkg/network"
|
||||
"github.com/nspcc-dev/neofs-node/pkg/network/cache"
|
||||
"github.com/nspcc-dev/neofs-node/pkg/services/object/util"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
@ -26,6 +27,8 @@ type remoteRangeWriter struct {
|
|||
addr *object.Address
|
||||
|
||||
rng *object.Range
|
||||
|
||||
clientCache *cache.ClientCache
|
||||
}
|
||||
|
||||
func (r *remoteRangeWriter) WriteTo(w io.Writer) (int64, error) {
|
||||
|
@ -39,9 +42,7 @@ func (r *remoteRangeWriter) WriteTo(w io.Writer) (int64, error) {
|
|||
return 0, err
|
||||
}
|
||||
|
||||
c, err := client.New(key,
|
||||
client.WithAddress(addr),
|
||||
)
|
||||
c, err := r.clientCache.Get(key, addr)
|
||||
if err != nil {
|
||||
return 0, errors.Wrapf(err, "(%T) could not create SDK client %s", r, addr)
|
||||
}
|
||||
|
|
|
@ -9,6 +9,7 @@ import (
|
|||
"github.com/nspcc-dev/neofs-node/pkg/core/netmap"
|
||||
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/localstore"
|
||||
"github.com/nspcc-dev/neofs-node/pkg/network"
|
||||
"github.com/nspcc-dev/neofs-node/pkg/network/cache"
|
||||
headsvc "github.com/nspcc-dev/neofs-node/pkg/services/object/head"
|
||||
objutil "github.com/nspcc-dev/neofs-node/pkg/services/object/util"
|
||||
"github.com/nspcc-dev/neofs-node/pkg/util"
|
||||
|
@ -35,6 +36,8 @@ type cfg struct {
|
|||
localAddrSrc network.LocalAddressSource
|
||||
|
||||
headSvc *headsvc.Service
|
||||
|
||||
clientCache *cache.ClientCache
|
||||
}
|
||||
|
||||
func defaultCfg() *cfg {
|
||||
|
@ -164,3 +167,9 @@ func WithHeadService(v *headsvc.Service) Option {
|
|||
c.headSvc = v
|
||||
}
|
||||
}
|
||||
|
||||
func WithClientCache(v *cache.ClientCache) Option {
|
||||
return func(c *cfg) {
|
||||
c.clientCache = v
|
||||
}
|
||||
}
|
||||
|
|
|
@ -178,13 +178,14 @@ loop:
|
|||
}
|
||||
} else {
|
||||
rngWriter = &remoteRangeWriter{
|
||||
ctx: p.ctx,
|
||||
keyStorage: p.keyStorage,
|
||||
node: addr,
|
||||
token: p.prm.common.SessionToken(),
|
||||
bearer: p.prm.common.BearerToken(),
|
||||
addr: objAddr,
|
||||
rng: nextRange,
|
||||
ctx: p.ctx,
|
||||
keyStorage: p.keyStorage,
|
||||
node: addr,
|
||||
token: p.prm.common.SessionToken(),
|
||||
bearer: p.prm.common.BearerToken(),
|
||||
addr: objAddr,
|
||||
rng: nextRange,
|
||||
clientCache: p.clientCache,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue