TrueCloudLab/frostfs-node
21
1
Fork 27
Code Issues 108 Pull requests 3 Projects Releases 1 Activity Actions

Fix/Do not process empty basic incomes #152

Merged
fyrchik merged 1 commit from carpawell/frostfs-node:fix/do-not-process-zero-basic-incomes into master 2023-03-21 06:59:34 +00:00
Conversation 0 Commits 1 Files changed 3 +11
3 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkg/innerring/processors/settlement/basic/collect.go
View file

@ -26,6 +26,11 @@ func (inc *IncomeSettlementContext) Collect() {
return return
} }
if cachedRate == 0 {
inc.noop = true
return
}
cnrEstimations, err := inc.estimations.Estimations(inc.epoch) cnrEstimations, err := inc.estimations.Estimations(inc.epoch)
if err != nil { if err != nil {
inc.log.Error("can't fetch container size estimations", inc.log.Error("can't fetch container size estimations",

2
pkg/innerring/processors/settlement/basic/context.go
View file

@ -28,6 +28,8 @@ type (
IncomeSettlementContext struct { IncomeSettlementContext struct {
mu sync.Mutex // lock to prevent collection and distribution in the same time mu sync.Mutex // lock to prevent collection and distribution in the same time
noop bool
log *logger.Logger log *logger.Logger
epoch uint64 epoch uint64

4
pkg/innerring/processors/settlement/basic/distribute.go
View file

@ -12,6 +12,10 @@ func (inc *IncomeSettlementContext) Distribute() {
inc.mu.Lock() inc.mu.Lock()
defer inc.mu.Unlock() defer inc.mu.Unlock()
if inc.noop {
return
}
txTable := common.NewTransferTable() txTable := common.NewTransferTable()
bankBalance, err := inc.balances.Balance(inc.bankOwner) bankBalance, err := inc.balances.Balance(inc.bankOwner)