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

[#28] Add recreating session token

Browse source 
Signed-off-by: Denis Kirillov <denis@nspcc.ru>
This commit is contained in:
Denis Kirillov 2021-07-28 11:42:55 +03:00 committed by Stanislav Bogatyrev
parent cb0a844cae
commit d95d722d61
2 changed files with 29 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkg/pool/pool.go
View file

@ -169,22 +169,35 @@ func updateNodesHealth(ctx context.Context, p *pool, options *BuilderOptions, bu
wg := sync.WaitGroup{} wg := sync.WaitGroup{}
for i, cPack := range p.clientPacks { for i, cPack := range p.clientPacks {
wg.Add(1) wg.Add(1)
go func(i int, netmap client.Netmap) { go func(i int, client client.Client) {
defer wg.Done() defer wg.Done()
var (
tkn *session.Token
err error
)
ok := true ok := true
tctx, c := context.WithTimeout(ctx, options.NodeRequestTimeout) tctx, c := context.WithTimeout(ctx, options.NodeRequestTimeout)
defer c() defer c()
if _, err := netmap.EndpointInfo(tctx); err != nil { if _, err = client.EndpointInfo(tctx); err != nil {
ok = false ok = false
bufferWeights[i] = 0 bufferWeights[i] = 0
} }
if ok { if ok {
bufferWeights[i] = options.weights[i] bufferWeights[i] = options.weights[i]
p.lock.RLock()
if !p.clientPacks[i].healthy {
if tkn, err = client.CreateSession(ctx, options.SessionExpirationEpoch); err != nil {
ok = false
bufferWeights[i] = 0
}
}
p.lock.RUnlock()
} }
p.lock.Lock() p.lock.Lock()
if p.clientPacks[i].healthy != ok { if p.clientPacks[i].healthy != ok {
p.clientPacks[i].healthy = ok p.clientPacks[i].healthy = ok
p.clientPacks[i].sessionToken = tkn
healthyChanged = true healthyChanged = true
} }
p.lock.Unlock() p.lock.Unlock()

21
pkg/pool/sampler_test.go
View file

@ -7,6 +7,7 @@ import (
"testing" "testing"
"github.com/nspcc-dev/neofs-api-go/pkg/client" "github.com/nspcc-dev/neofs-api-go/pkg/client"
"github.com/nspcc-dev/neofs-api-go/pkg/session"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )
@ -42,24 +43,28 @@ func TestSamplerStability(t *testing.T) {
} }
} }
type netmapMock struct { type clientMock struct {
client.Client client.Client
name string name string
err error err error
} }
func newNetmapMock(name string, needErr bool) netmapMock { func newNetmapMock(name string, needErr bool) clientMock {
var err error var err error
if needErr { if needErr {
err = fmt.Errorf("not available") err = fmt.Errorf("not available")
} }
return netmapMock{name: name, err: err} return clientMock{name: name, err: err}
} }
func (n netmapMock) EndpointInfo(_ context.Context, _ ...client.CallOption) (*client.EndpointInfo, error) { func (n clientMock) EndpointInfo(_ context.Context, _ ...client.CallOption) (*client.EndpointInfo, error) {
return nil, n.err return nil, n.err
} }
func (n clientMock) CreateSession(_ context.Context, _ uint64, _ ...client.CallOption) (*session.Token, error) {
return session.NewToken(), n.err
}
func TestHealthyReweight(t *testing.T) { func TestHealthyReweight(t *testing.T) {
var ( var (
weights = []float64{0.9, 0.1} weights = []float64{0.9, 0.1}
@ -78,14 +83,14 @@ func TestHealthyReweight(t *testing.T) {
// check getting first node connection before rebalance happened // check getting first node connection before rebalance happened
connection0, _, err := p.Connection() connection0, _, err := p.Connection()
require.NoError(t, err) require.NoError(t, err)
mock0 := connection0.(netmapMock) mock0 := connection0.(clientMock)
require.Equal(t, names[0], mock0.name) require.Equal(t, names[0], mock0.name)
updateNodesHealth(context.TODO(), p, options, buffer) updateNodesHealth(context.TODO(), p, options, buffer)
connection1, _, err := p.Connection() connection1, _, err := p.Connection()
require.NoError(t, err) require.NoError(t, err)
mock1 := connection1.(netmapMock) mock1 := connection1.(clientMock)
require.Equal(t, names[1], mock1.name) require.Equal(t, names[1], mock1.name)
// enabled first node again // enabled first node again
@ -98,8 +103,10 @@ func TestHealthyReweight(t *testing.T) {
connection0, _, err = p.Connection() connection0, _, err = p.Connection()
require.NoError(t, err) require.NoError(t, err)
mock0 = connection0.(netmapMock) mock0 = connection0.(clientMock)
require.Equal(t, names[0], mock0.name) require.Equal(t, names[0], mock0.name)
require.NotNil(t, p.clientPacks[0].sessionToken)
} }
func TestHealthyNoReweight(t *testing.T) { func TestHealthyNoReweight(t *testing.T) {