advance time of metrics aggregates

ydb-platform · May 13, 2024 · 9bfec73 · 9bfec73
1 parent 2631f5b
commit 9bfec73
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/ydb/core/mind/hive/tablet_info.cpp b/ydb/core/mind/hive/tablet_info.cpp
@@ -324,29 +324,35 @@ void TTabletInfo::UpdateResourceUsage(const NKikimrTabletBase::TMetrics& metrics
                 BLOG_W("Ignoring too high CPU metric (" << metrics.GetCPU() << ") for tablet " << ToString());
             } else {
                 ResourceMetricsAggregates.MaximumCPU.SetValue(metrics.GetCPU(), now);
-                ResourceValues.SetCPU(ResourceMetricsAggregates.MaximumCPU.GetValue());
             }
+        } else {
+            ResourceMetricsAggregates.MaximumCPU.AdvanceTime(now);
         }
+        ResourceValues.SetCPU(ResourceMetricsAggregates.MaximumCPU.GetValue());
     }
     if (Find(allowedMetricIds, NKikimrTabletBase::TMetrics::kMemoryFieldNumber) != allowedMetricIds.end()) {
         if (metrics.HasMemory()) {
             if (metrics.GetMemory() > static_cast<ui64>(std::get<NMetrics::EResource::Memory>(maximum))) {
                 BLOG_W("Ignoring too high Memory metric (" << metrics.GetMemory() << ") for tablet " << ToString());
             } else {
                 ResourceMetricsAggregates.MaximumMemory.SetValue(metrics.GetMemory(), now);
-                ResourceValues.SetMemory(ResourceMetricsAggregates.MaximumMemory.GetValue());
             }
+        } else {
+            ResourceMetricsAggregates.MaximumMemory.AdvanceTime(now);
         }
+        ResourceValues.SetMemory(ResourceMetricsAggregates.MaximumMemory.GetValue());
     }
     if (Find(allowedMetricIds, NKikimrTabletBase::TMetrics::kNetworkFieldNumber) != allowedMetricIds.end()) {
         if (metrics.HasNetwork()) {
             if (metrics.GetNetwork() > static_cast<ui64>(std::get<NMetrics::EResource::Network>(maximum))) {
                 BLOG_W("Ignoring too high Network metric (" << metrics.GetNetwork() << ") for tablet " << ToString());
             } else {
                 ResourceMetricsAggregates.MaximumNetwork.SetValue(metrics.GetNetwork(), now);
-                ResourceValues.SetNetwork(ResourceMetricsAggregates.MaximumNetwork.GetValue());
             }
+        } else {
+            ResourceMetricsAggregates.MaximumNetwork.AdvanceTime(now);
         }
+        ResourceValues.SetNetwork(ResourceMetricsAggregates.MaximumNetwork.GetValue());
     }
     if (metrics.HasStorage()) {
         ResourceValues.SetStorage(metrics.GetStorage());

diff --git a/ydb/core/util/metrics.h b/ydb/core/util/metrics.h
@@ -436,6 +436,15 @@ class TMaximumValueVariableWindowUI64 : public NKikimrMetricsProto::TMaximumValu
         }
     }
 
+    void AdvanceTime(TInstant now) {
+        // Nothing changed, last value is stiil relevant
+        TType lastValue = {};
+        if (!TProto::GetValues().empty()) {
+            lastValue = *std::prev(TProto::MutableValues()->end());
+        }
+        SetValue(lastValue, now);
+    }
+
     TType GetValue() const {
         return MaximumValue;
     }