s.makhov/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Pull requests Activity

[#184] Use SDK client cache in object.Range

Browse source 
Signed-off-by: Alex Vanin <alexey@nspcc.ru>
This commit is contained in:
Alex Vanin 2020-11-18 16:04:33 +03:00 committed by Alex Vanin
parent d485a5967d
commit f85e88c4f8
4 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cmd/neofs-node/object.go
View file

@ -294,6 +294,7 @@ func initObjectService(c *cfg) {
sRange := rangesvc.NewService( sRange := rangesvc.NewService(
rangesvc.WithKeyStorage(keyStorage), rangesvc.WithKeyStorage(keyStorage),
rangesvc.WithClientCache(clientCache),
rangesvc.WithLocalStorage(ls), rangesvc.WithLocalStorage(ls),
rangesvc.WithContainerSource(c.cfgObject.cnrStorage), rangesvc.WithContainerSource(c.cfgObject.cnrStorage),
rangesvc.WithNetworkMapSource(c.cfgObject.netMapStorage), rangesvc.WithNetworkMapSource(c.cfgObject.netMapStorage),

7
pkg/services/object/range/remote.go
View file

@ -8,6 +8,7 @@ import (
"github.com/nspcc-dev/neofs-api-go/pkg/object" "github.com/nspcc-dev/neofs-api-go/pkg/object"
"github.com/nspcc-dev/neofs-api-go/pkg/token" "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"
"github.com/nspcc-dev/neofs-node/pkg/network/cache"
"github.com/nspcc-dev/neofs-node/pkg/services/object/util" "github.com/nspcc-dev/neofs-node/pkg/services/object/util"
"github.com/pkg/errors" "github.com/pkg/errors"
) )
@ -26,6 +27,8 @@ type remoteRangeWriter struct {
addr *object.Address addr *object.Address
rng *object.Range rng *object.Range
clientCache *cache.ClientCache
} }
func (r *remoteRangeWriter) WriteTo(w io.Writer) (int64, error) { 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 return 0, err
} }
c, err := client.New(key, c, err := r.clientCache.Get(key, addr)
client.WithAddress(addr),
)
if err != nil { if err != nil {
return 0, errors.Wrapf(err, "(%T) could not create SDK client %s", r, addr) return 0, errors.Wrapf(err, "(%T) could not create SDK client %s", r, addr)
} }

9
pkg/services/object/range/service.go
View file

@ -9,6 +9,7 @@ import (
"github.com/nspcc-dev/neofs-node/pkg/core/netmap" "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/local_object_storage/localstore"
"github.com/nspcc-dev/neofs-node/pkg/network" "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" headsvc "github.com/nspcc-dev/neofs-node/pkg/services/object/head"
objutil "github.com/nspcc-dev/neofs-node/pkg/services/object/util" objutil "github.com/nspcc-dev/neofs-node/pkg/services/object/util"
"github.com/nspcc-dev/neofs-node/pkg/util" "github.com/nspcc-dev/neofs-node/pkg/util"
@ -35,6 +36,8 @@ type cfg struct {
localAddrSrc network.LocalAddressSource localAddrSrc network.LocalAddressSource
headSvc *headsvc.Service headSvc *headsvc.Service
clientCache *cache.ClientCache
} }
func defaultCfg() *cfg { func defaultCfg() *cfg {
@ -164,3 +167,9 @@ func WithHeadService(v *headsvc.Service) Option {
c.headSvc = v c.headSvc = v
} }
} }
func WithClientCache(v *cache.ClientCache) Option {
return func(c *cfg) {
c.clientCache = v
}
}

15
pkg/services/object/range/streamer.go
View file

@ -178,13 +178,14 @@ loop:
} }
} else { } else {
rngWriter = &remoteRangeWriter{ rngWriter = &remoteRangeWriter{
ctx: p.ctx, ctx: p.ctx,
keyStorage: p.keyStorage, keyStorage: p.keyStorage,
node: addr, node: addr,
token: p.prm.common.SessionToken(), token: p.prm.common.SessionToken(),
bearer: p.prm.common.BearerToken(), bearer: p.prm.common.BearerToken(),
addr: objAddr, addr: objAddr,
rng: nextRange, rng: nextRange,
clientCache: p.clientCache,
} }
} }