[#1445] policer: Refactor (*Policer).shardPolicyWorker
It's because of warnings from `gocognit` linter. Signed-off-by: Aleksey Savchuk <a.savchuk@yadro.com>
This commit is contained in:
parent
4e316367f1
commit
165dd6d545
1 changed files with 35 additions and 30 deletions
|
@ -7,6 +7,7 @@ import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.frostfs.info/TrueCloudLab/frostfs-node/internal/logs"
|
"git.frostfs.info/TrueCloudLab/frostfs-node/internal/logs"
|
||||||
|
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object"
|
||||||
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine"
|
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine"
|
||||||
cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
|
cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
|
@ -18,10 +19,11 @@ func (p *Policer) Run(ctx context.Context) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *Policer) shardPolicyWorker(ctx context.Context) {
|
func (p *Policer) shardPolicyWorker(ctx context.Context) {
|
||||||
|
defer p.taskPool.Release()
|
||||||
|
|
||||||
for {
|
for {
|
||||||
select {
|
select {
|
||||||
case <-ctx.Done():
|
case <-ctx.Done():
|
||||||
p.taskPool.Release()
|
|
||||||
return
|
return
|
||||||
default:
|
default:
|
||||||
}
|
}
|
||||||
|
@ -37,45 +39,48 @@ func (p *Policer) shardPolicyWorker(ctx context.Context) {
|
||||||
}
|
}
|
||||||
|
|
||||||
skipMap := newSkipMap()
|
skipMap := newSkipMap()
|
||||||
for i := range addrs {
|
for _, addr := range addrs {
|
||||||
select {
|
select {
|
||||||
case <-ctx.Done():
|
case <-ctx.Done():
|
||||||
p.taskPool.Release()
|
|
||||||
return
|
return
|
||||||
default:
|
default:
|
||||||
addr := addrs[i]
|
}
|
||||||
if p.objsInWork.inWork(addr.Address) {
|
if p.objsInWork.inWork(addr.Address) {
|
||||||
// do not process an object
|
// do not process an object that is in work
|
||||||
// that is in work
|
continue
|
||||||
continue
|
}
|
||||||
}
|
|
||||||
|
|
||||||
err := p.taskPool.Submit(func() {
|
if err := p.submitPolicerTask(ctx, addr, skipMap); err != nil {
|
||||||
v, ok := p.cache.Get(addr.Address)
|
p.log.Warn(logs.PolicerPoolSubmission, zap.Error(err))
|
||||||
if ok && time.Since(v) < p.evictDuration {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if p.objsInWork.add(addr.Address) {
|
|
||||||
err := p.processObject(ctx, addr)
|
|
||||||
if err != nil && !skipMap.addSeenError(addr.Address.Container(), err) {
|
|
||||||
p.log.Error(logs.PolicerUnableToProcessObj,
|
|
||||||
zap.Stringer("object", addr.Address),
|
|
||||||
zap.String("error", err.Error()))
|
|
||||||
}
|
|
||||||
p.cache.Add(addr.Address, time.Now())
|
|
||||||
p.objsInWork.remove(addr.Address)
|
|
||||||
p.metrics.IncProcessedObjects()
|
|
||||||
}
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
p.log.Warn(logs.PolicerPoolSubmission, zap.Error(err))
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (p *Policer) submitPolicerTask(ctx context.Context, addr object.Info, skipMap *errMap) error {
|
||||||
|
return p.taskPool.Submit(func() {
|
||||||
|
v, ok := p.cache.Get(addr.Address)
|
||||||
|
if ok && time.Since(v) < p.evictDuration {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if !p.objsInWork.add(addr.Address) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
err := p.processObject(ctx, addr)
|
||||||
|
if err != nil && !skipMap.addSeenError(addr.Address.Container(), err) {
|
||||||
|
p.log.Error(logs.PolicerUnableToProcessObj,
|
||||||
|
zap.Stringer("object", addr.Address),
|
||||||
|
zap.String("error", err.Error()))
|
||||||
|
}
|
||||||
|
|
||||||
|
p.cache.Add(addr.Address, time.Now())
|
||||||
|
p.objsInWork.remove(addr.Address)
|
||||||
|
p.metrics.IncProcessedObjects()
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
type errMap struct {
|
type errMap struct {
|
||||||
sync.Mutex
|
sync.Mutex
|
||||||
skipMap map[cid.ID][]error
|
skipMap map[cid.ID][]error
|
||||||
|
|
Loading…
Add table
Reference in a new issue