TrueCloudLab/frostfs-node
20
1
Fork 27
Code Issues 93 Pull requests 4 Projects Releases 1 Activity Actions

[#938] shard: Update only changed counters
All checks were successful
DCO action / DCO (pull_request) Successful in 5m40s
Details
Vulncheck / Vulncheck (pull_request) Successful in 5m33s
Details
Tests and linters / Staticcheck (pull_request) Successful in 7m12s
Details
Build / Build Components (1.21) (pull_request) Successful in 7m25s
Details
Build / Build Components (1.20) (pull_request) Successful in 7m29s
Details
Tests and linters / Lint (pull_request) Successful in 8m26s
Details
Tests and linters / Tests (1.20) (pull_request) Successful in 9m48s
Details
Tests and linters / Tests with -race (pull_request) Successful in 9m56s
Details
Tests and linters / Tests (1.21) (pull_request) Successful in 10m10s
Details

Browse source 
If metric value hasn't changed, but we update metric, then
non existed metric will apear with zero value.

Signed-off-by: Dmitrii Stepanov <d.stepanov@yadro.com>
This commit is contained in:
Dmitrii Stepanov 2024-01-30 11:37:06 +03:00
parent c681354afd
commit 675eec91f3
1 changed files with 32 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
pkg/local_object_storage/shard/shard.go
View file

@ -433,9 +433,9 @@ func (s *Shard) updateMetrics(ctx context.Context) {
return return
} }
s.cfg.metricsWriter.SetObjectCounter(physical, cc.Phy) s.setObjectCounterBy(physical, cc.Phy)
s.cfg.metricsWriter.SetObjectCounter(logical, cc.Logic) s.setObjectCounterBy(logical, cc.Logic)
s.cfg.metricsWriter.SetObjectCounter(user, cc.User) s.setObjectCounterBy(user, cc.User)
cnrList, err := s.metaBase.Containers(ctx) cnrList, err := s.metaBase.Containers(ctx)
if err != nil { if err != nil {
@ -453,11 +453,11 @@ func (s *Shard) updateMetrics(ctx context.Context) {
zap.Error(err)) zap.Error(err))
continue continue
} }
s.metricsWriter.AddToContainerSize(cnrList[i].EncodeToString(), int64(size)) s.addToContainerSize(cnrList[i].EncodeToString(), int64(size))
totalPayload += size totalPayload += size
} }
s.metricsWriter.AddToPayloadSize(int64(totalPayload)) s.addToPayloadSize(int64(totalPayload))
contCount, err := s.metaBase.ContainerCounters(ctx) contCount, err := s.metaBase.ContainerCounters(ctx)
if err != nil { if err != nil {
@ -465,9 +465,9 @@ func (s *Shard) updateMetrics(ctx context.Context) {
return return
} }
for contID, count := range contCount.Counts { for contID, count := range contCount.Counts {
s.metricsWriter.SetContainerObjectsCount(contID.EncodeToString(), physical, count.Phy) s.setContainerObjectsCount(contID.EncodeToString(), physical, count.Phy)
s.metricsWriter.SetContainerObjectsCount(contID.EncodeToString(), logical, count.Logic) s.setContainerObjectsCount(contID.EncodeToString(), logical, count.Logic)
s.metricsWriter.SetContainerObjectsCount(contID.EncodeToString(), user, count.User) s.setContainerObjectsCount(contID.EncodeToString(), user, count.User)
} }
} }
@ -487,35 +487,53 @@ func (s *Shard) incObjectCounter(cnrID cid.ID, isUser bool) {
} }
func (s *Shard) decObjectCounterBy(typ string, v uint64) { func (s *Shard) decObjectCounterBy(typ string, v uint64) {
if s.cfg.metricsWriter != nil { if s.cfg.metricsWriter != nil && v > 0 {
s.cfg.metricsWriter.AddToObjectCounter(typ, -int(v)) s.cfg.metricsWriter.AddToObjectCounter(typ, -int(v))
} }
} }
func (s *Shard) setObjectCounterBy(typ string, v uint64) {
if s.cfg.metricsWriter != nil && v > 0 {
s.cfg.metricsWriter.SetObjectCounter(typ, v)
}
}
func (s *Shard) decContainerObjectCounter(byCnr map[cid.ID]meta.ObjectCounters) { func (s *Shard) decContainerObjectCounter(byCnr map[cid.ID]meta.ObjectCounters) {
if s.cfg.metricsWriter == nil { if s.cfg.metricsWriter == nil {
return return
} }
for cnrID, count := range byCnr { for cnrID, count := range byCnr {
if count.Phy > 0 {
s.cfg.metricsWriter.SubContainerObjectsCount(cnrID.EncodeToString(), physical, count.Phy) s.cfg.metricsWriter.SubContainerObjectsCount(cnrID.EncodeToString(), physical, count.Phy)
}
if count.Logic > 0 {
s.cfg.metricsWriter.SubContainerObjectsCount(cnrID.EncodeToString(), logical, count.Logic) s.cfg.metricsWriter.SubContainerObjectsCount(cnrID.EncodeToString(), logical, count.Logic)
}
if count.User > 0 {
s.cfg.metricsWriter.SubContainerObjectsCount(cnrID.EncodeToString(), user, count.User) s.cfg.metricsWriter.SubContainerObjectsCount(cnrID.EncodeToString(), user, count.User)
} }
} }
}
func (s *Shard) addToContainerSize(cnr string, size int64) { func (s *Shard) addToContainerSize(cnr string, size int64) {
if s.cfg.metricsWriter != nil { if s.cfg.metricsWriter != nil && size != 0 {
s.cfg.metricsWriter.AddToContainerSize(cnr, size) s.cfg.metricsWriter.AddToContainerSize(cnr, size)
} }
} }
func (s *Shard) addToPayloadSize(size int64) { func (s *Shard) addToPayloadSize(size int64) {
if s.cfg.metricsWriter != nil { if s.cfg.metricsWriter != nil && size != 0 {
s.cfg.metricsWriter.AddToPayloadSize(size) s.cfg.metricsWriter.AddToPayloadSize(size)
} }
} }
func (s *Shard) setContainerObjectsCount(cnr string, typ string, v uint64) {
if s.cfg.metricsWriter != nil && v > 0 {
s.metricsWriter.SetContainerObjectsCount(cnr, typ, v)
}
}
func (s *Shard) IncErrorCounter() { func (s *Shard) IncErrorCounter() {
if s.cfg.metricsWriter != nil { if s.cfg.metricsWriter != nil {
s.cfg.metricsWriter.IncErrorCounter() s.cfg.metricsWriter.IncErrorCounter()