TrueCloudLab
/
frostfs-sdk-go
30
0
Fork 19
Code Issues 29 Pull Requests 3 Actions Releases Activity

[#197] pool: Remove unused function parameter 

`owner.ID` parameter of `createSessionTokenForDuration` function is no
longer used since session owner is set automatically during the sign
operation. As a consequence, remove `Pool.sessionOwner` field and its
getter.

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
remotes/fyrchik/split-info-format
Leonard Lyubich 2022-04-26 12:52:01 +03:00 committed by LeL
parent 4dc3a7669e
commit e468f409d7
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pool/pool.go
View File

@ -904,7 +904,6 @@ type resCreateSession struct {
type Pool struct { type Pool struct {
innerPools []*innerPool innerPools []*innerPool
key *ecdsa.PrivateKey key *ecdsa.PrivateKey
sessionOwner user.ID
cancel context.CancelFunc cancel context.CancelFunc
closedCh chan struct{} closedCh chan struct{}
cache *sessionCache cache *sessionCache
@ -959,8 +958,6 @@ func NewPool(options InitParameters) (*Pool, error) {
clientBuilder: options.clientBuilder, clientBuilder: options.clientBuilder,
} }
user.IDFromKey(&pool.sessionOwner, options.key.PublicKey)
return pool, nil return pool, nil
} }
@ -984,7 +981,7 @@ func (p *Pool) Dial(ctx context.Context) error {
return err return err
} }
var healthy bool var healthy bool
st, err := createSessionTokenForDuration(ctx, c, p.sessionOwner, p.rebalanceParams.sessionExpirationDuration) st, err := createSessionTokenForDuration(ctx, 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),
@ -1207,10 +1204,6 @@ func (p *innerPool) connection() (*clientPack, error) {
return nil, errors.New("no healthy client") return nil, errors.New("no healthy client")
} }
func (p *Pool) OwnerID() *user.ID {
return &p.sessionOwner
}
func formCacheKey(address string, key *ecdsa.PrivateKey) string { func formCacheKey(address string, key *ecdsa.PrivateKey) string {
k := keys.PrivateKey{PrivateKey: *key} k := keys.PrivateKey{PrivateKey: *key}
return address + k.String() return address + k.String()
@ -1230,7 +1223,7 @@ func (p *Pool) checkSessionTokenErr(err error, address string) bool {
return false return false
} }
func createSessionTokenForDuration(ctx context.Context, c client, ownerID user.ID, dur uint64) (*session.Object, error) { func createSessionTokenForDuration(ctx context.Context, c client, dur uint64) (*session.Object, error) {
ni, err := c.networkInfo(ctx, prmNetworkInfo{}) ni, err := c.networkInfo(ctx, prmNetworkInfo{})
if err != nil { if err != nil {
return nil, err return nil, err
@ -1330,12 +1323,9 @@ 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 var err error
var sessionOwner user.ID
user.IDFromKey(&sessionOwner, ctx.key.PublicKey)
// open new session // open new session
t, err := createSessionTokenForDuration(ctx, ctx.client, sessionOwner, p.stokenDuration) 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)
} }