nzinkevich/frostfs-sdk-go
1
0
Fork 0
forked from TrueCloudLab/frostfs-sdk-go
Code Pull requests Activity

[#197] pool: Change function signature

Browse source 
Make `createSessionTokenForDuration` to accept a pointer to
`session.Object` and write the response on session creation request
through the pointer. Rename function to `initSessionForDuration`. As a
consequence, problem in `openDefaultSession` with uncached sessions is
fixed.

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2022-04-26 13:09:13 +03:00 committed by LeL
parent f0134ef26e
commit 4cbbbdd3e2
1 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
pool/pool.go
View file

@ -981,14 +981,15 @@ func (p *Pool) Dial(ctx context.Context) error {
return err return err
} }
var healthy bool var healthy bool
st, err := createSessionTokenForDuration(ctx, c, p.rebalanceParams.sessionExpirationDuration) var st session.Object
err = initSessionForDuration(ctx, &st, c, p.rebalanceParams.sessionExpirationDuration)
if err != nil && p.logger != nil { if err != nil && p.logger != nil {
p.logger.Warn("failed to create neofs session token for client", p.logger.Warn("failed to create neofs session token for client",
zap.String("Address", addr), zap.String("Address", addr),
zap.Error(err)) zap.Error(err))
} else if err == nil { } else if err == nil {
healthy, atLeastOneHealthy = true, true healthy, atLeastOneHealthy = true, true
_ = p.cache.Put(formCacheKey(addr, p.key), *st) _ = p.cache.Put(formCacheKey(addr, p.key), st)
} }
clientPacks[j] = &clientPack{client: c, healthy: healthy, address: addr} clientPacks[j] = &clientPack{client: c, healthy: healthy, address: addr}
} }
@ -1223,10 +1224,10 @@ func (p *Pool) checkSessionTokenErr(err error, address string) bool {
return false return false
} }
func createSessionTokenForDuration(ctx context.Context, c client, dur uint64) (*session.Object, error) { func initSessionForDuration(ctx context.Context, dst *session.Object, c client, dur uint64) error {
ni, err := c.networkInfo(ctx, prmNetworkInfo{}) ni, err := c.networkInfo(ctx, prmNetworkInfo{})
if err != nil { if err != nil {
return nil, err return err
} }
epoch := ni.CurrentEpoch() epoch := ni.CurrentEpoch()
@ -1242,29 +1243,28 @@ func createSessionTokenForDuration(ctx context.Context, c client, dur uint64) (*
res, err := c.sessionCreate(ctx, prm) res, err := c.sessionCreate(ctx, prm)
if err != nil { if err != nil {
return nil, err return err
} }
var id uuid.UUID var id uuid.UUID
err = id.UnmarshalBinary(res.id) err = id.UnmarshalBinary(res.id)
if err != nil { if err != nil {
return nil, fmt.Errorf("invalid session token ID: %w", err) return fmt.Errorf("invalid session token ID: %w", err)
} }
var key neofsecdsa.PublicKey var key neofsecdsa.PublicKey
err = key.Decode(res.sessionKey) err = key.Decode(res.sessionKey)
if err != nil { if err != nil {
return nil, fmt.Errorf("invalid public session key: %w", err) return fmt.Errorf("invalid public session key: %w", err)
} }
var st session.Object dst.SetID(id)
st.SetID(id) dst.SetAuthKey(&key)
st.SetAuthKey(&key) dst.SetExp(exp)
st.SetExp(exp)
return &st, nil return nil
} }
type callContext struct { type callContext struct {
@ -1322,16 +1322,14 @@ func (p *Pool) openDefaultSession(ctx *callContext) error {
tok, ok := p.cache.Get(cacheKey) tok, ok := p.cache.Get(cacheKey)
if !ok { if !ok {
var err error // init new session
err := initSessionForDuration(ctx, &tok, ctx.client, p.stokenDuration)
// open new session
t, err := createSessionTokenForDuration(ctx, ctx.client, p.stokenDuration)
if err != nil { if err != nil {
return fmt.Errorf("session API client: %w", err) return fmt.Errorf("session API client: %w", err)
} }
// cache the opened session // cache the opened session
p.cache.Put(cacheKey, *t) p.cache.Put(cacheKey, tok)
} }
tok.ForVerb(ctx.sessionVerb) tok.ForVerb(ctx.sessionVerb)