mbiryukova/frostfs-http-gw
1
0
Fork 0
forked from TrueCloudLab/frostfs-http-gw
Code Pull requests Activity

refactoring connectionpool: add healthcheck, move getConnection and first call reBalance outside constructor

Browse source
This commit is contained in:
Evgeniy Kulikov 2020-02-28 20:05:25 +03:00
parent 35e2378afc
commit 7790684726
No known key found for this signature in database
GPG key ID: BF6AEE0A2A699BF2
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
pool.go
View file

@ -46,15 +46,18 @@ type (
nodes []*node
keys []uint32
conns map[uint32][]*node
unhealthy *atomic.Error
}
)
var (
errBootstrapping = errors.New("bootstrapping")
errEmptyConnection = errors.New("empty connection")
errNoHealthyConnections = errors.New("no active connections")
)
func newPool(ctx context.Context, l *zap.Logger, v *viper.Viper) (*Pool, error) {
func newPool(l *zap.Logger, v *viper.Viper) *Pool {
p := &Pool{
log: l,
Mutex: new(sync.Mutex),
@ -74,6 +77,8 @@ func newPool(ctx context.Context, l *zap.Logger, v *viper.Viper) (*Pool, error)
Timeout: defaultKeepaliveTimeout,
PermitWithoutStream: true,
},
unhealthy: atomic.NewError(errBootstrapping),
}
buf := make([]byte, 8)
@ -126,11 +131,7 @@ func newPool(ctx context.Context, l *zap.Logger, v *viper.Viper) (*Pool, error)
zap.Uint32("weight", p.nodes[i].weight))
}
p.reBalance(ctx)
_, err := p.getConnection(ctx)
return p, err
return p
}
func (p *Pool) close() {
@ -150,7 +151,12 @@ func (p *Pool) close() {
func (p *Pool) reBalance(ctx context.Context) {
p.Lock()
defer p.Unlock()
defer func() {
p.Unlock()
_, err := p.getConnection(ctx)
p.unhealthy.Store(err)
}()
keys := make(map[uint32]struct{})
@ -166,8 +172,9 @@ func (p *Pool) reBalance(ctx context.Context) {
weight = p.nodes[i].weight
)
if ctx.Err() != nil {
p.log.Warn("something went wrong", zap.Error(ctx.Err()))
if err = ctx.Err(); err != nil {
p.log.Warn("something went wrong", zap.Error(err))
p.unhealthy.Store(err)
return
}