fixes

Author: vporyadke

ydb/core/mind/hive/hive_impl.cpp

@@ -2494,19 +2494,19 @@ bool THive::StopSubActor(TSubActorId subActorId) {
 }
 
 bool THive::IsValidMetrics(const NKikimrTabletBase::TMetrics& metrics) {
-    return IsValidMetricsCPU(metrics.GetCPU()) || IsValidMetricsMemory(metrics.GetMemory()) || IsValidMetricsNetwork(metrics.GetNetwork());
+    return IsValidMetricsCPU(metrics) || IsValidMetricsMemory(metrics) || IsValidMetricsNetwork(metrics);
 }
 
-bool THive::IsValidMetricsCPU(ui64 cpu) {
-    return cpu > 1'000/*1ms*/;
+bool THive::IsValidMetricsCPU(const NKikimrTabletBase::TMetrics& metrics) {
+    return metrics.GetCPU() > 1'000/*1ms*/;
 }
 
-bool THive::IsValidMetricsMemory(ui64 memory) {
-    return memory > 128'000/*128KB*/;
+bool THive::IsValidMetricsMemory(const NKikimrTabletBase::TMetrics& metrics) {
+    return metrics.GetMemory() > 128'000/*128KB*/;
 }
 
-bool THive::IsValidMetricsNetwork(ui64 network) {
-    return network > 1024/*1KBps*/;
+bool THive::IsValidMetricsNetwork(const NKikimrTabletBase::TMetrics& metrics) {
+    return metrics.GetNetwork() > 1024/*1KBps*/;
 }
 
 TString THive::DebugDomainsActiveNodes() const {

ydb/core/mind/hive/hive_impl.h

@@ -667,9 +667,9 @@ class THive : public TActor<THive>, public TTabletExecutedFlat, public THiveShar
     const TVector<i64>& GetTabletTypeAllowedMetricIds(TTabletTypes::EType type) const;
     static const TVector<i64>& GetDefaultAllowedMetricIdsForType(TTabletTypes::EType type);
     static bool IsValidMetrics(const NKikimrTabletBase::TMetrics& metrics);
-    static bool IsValidMetricsCPU(ui64 cpu);
-    static bool IsValidMetricsMemory(ui64 memory);
-    static bool IsValidMetricsNetwork(ui64 network);
+    static bool IsValidMetricsCPU(const NKikimrTabletBase::TMetrics& metrics);
+    static bool IsValidMetricsMemory(const NKikimrTabletBase::TMetrics& metrics);
+    static bool IsValidMetricsNetwork(const NKikimrTabletBase::TMetrics& metrics);
     void UpdateTotalResourceValues(
             const TNodeInfo* node,
             const TTabletInfo* tablet,

ydb/core/mind/hive/hive_ut.cpp

@@ -4672,6 +4672,16 @@ Y_UNIT_TEST_SUITE(THiveTest) {
         auto newDistribution = getDistribution();
 
         UNIT_ASSERT_EQUAL(initialDistribution, newDistribution);
+
+        {
+            auto request = std::make_unique<TEvHive::TEvRequestHiveDomainStats>();
+            request->Record.SetReturnMetrics(true);
+            runtime.SendToPipe(hiveTablet, senderA, request.release());
+            TAutoPtr<IEventHandle> handle;
+            TEvHive::TEvResponseHiveDomainStats* response = runtime.GrabEdgeEventRethrow<TEvHive::TEvResponseHiveDomainStats>(handle);
+            ui64 totalCounter = response->Record.GetDomainStats(0).GetMetrics().GetCounter();
+            UNIT_ASSERT_VALUES_EQUAL(totalCounter, 0);
+        }
     }
 
     Y_UNIT_TEST(TestHiveBalancerWithImmovableTablets) {

ydb/core/mind/hive/tablet_info.cpp

@@ -426,17 +426,21 @@ TResourceRawValues TTabletInfo::GetResourceMaximumValues() const {
     }
 }
 
-i64 TTabletInfo::GetCounterValue(const TTabletMetricsAggregates& metrics, const TVector<i64>& allowedMetricIds) {
+i64 TTabletInfo::GetCounterValue() const {
+    const auto& allowedMetricIds = GetTabletAllowedMetricIds();
     if (HasAllowedMetric(allowedMetricIds, EResourceToBalance::CPU)
-        && THive::IsValidMetricsCPU(metrics.MaximumCPU.GetAllTimeMaximum())) {
+        && (ResourceMetricsAggregates.MaximumCPU.GetAllTimeMaximum() > 0
+        || ResourceValues.GetCPU() > 0)) {
         return 0;
     }
     if (HasAllowedMetric(allowedMetricIds, EResourceToBalance::Memory)
-        && THive::IsValidMetricsMemory(metrics.MaximumMemory.GetAllTimeMaximum() > 0)) {
+        && (ResourceMetricsAggregates.MaximumMemory.GetAllTimeMaximum() > 0
+        || ResourceValues.GetMemory() > 0)) {
         return 0;
     }
     if (HasAllowedMetric(allowedMetricIds, EResourceToBalance::Network)
-        && THive::IsValidMetricsNetwork(metrics.MaximumNetwork.GetAllTimeMaximum())) {
+        && (ResourceMetricsAggregates.MaximumNetwork.GetAllTimeMaximum() > 0
+        || ResourceValues.GetNetwork() > 0)) {
         return 0;
     }
     return 1;
@@ -448,13 +452,13 @@ void TTabletInfo::FilterRawValues(TResourceRawValues& values) const {
     if (metrics.GetCounter() == 0) {
         std::get<NMetrics::EResource::Counter>(values) = 0;
     }
-    if (!HasAllowedMetric(allowedMetricIds, EResourceToBalance::CPU) || !THive::IsValidMetricsCPU(metrics.GetCPU())) {
+    if (!HasAllowedMetric(allowedMetricIds, EResourceToBalance::CPU) || !THive::IsValidMetricsCPU(metrics)) {
         std::get<NMetrics::EResource::CPU>(values) = 0;
     }
-    if (!HasAllowedMetric(allowedMetricIds, EResourceToBalance::Memory) || !THive::IsValidMetricsMemory(metrics.GetMemory())) {
+    if (!HasAllowedMetric(allowedMetricIds, EResourceToBalance::Memory) || !THive::IsValidMetricsMemory(metrics)) {
         std::get<NMetrics::EResource::Memory>(values) = 0;
     }
-    if (!HasAllowedMetric(allowedMetricIds, EResourceToBalance::Network) || !THive::IsValidMetricsNetwork(metrics.GetNetwork())) {
+    if (!HasAllowedMetric(allowedMetricIds, EResourceToBalance::Network) || !THive::IsValidMetricsNetwork(metrics)) {
         std::get<NMetrics::EResource::Network>(values) = 0;
     }
 }
@@ -465,20 +469,19 @@ void TTabletInfo::FilterRawValues(TResourceNormalizedValues& values) const {
     if (metrics.GetCounter() == 0) {
         std::get<NMetrics::EResource::Counter>(values) = 0;
     }
-    if (!HasAllowedMetric(allowedMetricIds, EResourceToBalance::CPU) || !THive::IsValidMetricsCPU(metrics.GetCPU())) {
+    if (!HasAllowedMetric(allowedMetricIds, EResourceToBalance::CPU) || !THive::IsValidMetricsCPU(metrics)) {
         std::get<NMetrics::EResource::CPU>(values) = 0;
     }
-    if (!HasAllowedMetric(allowedMetricIds, EResourceToBalance::Memory) || !THive::IsValidMetricsMemory(metrics.GetMemory())) {
+    if (!HasAllowedMetric(allowedMetricIds, EResourceToBalance::Memory) || !THive::IsValidMetricsMemory(metrics)) {
         std::get<NMetrics::EResource::Memory>(values) = 0;
     }
-    if (!HasAllowedMetric(allowedMetricIds, EResourceToBalance::Network) || !THive::IsValidMetricsNetwork(metrics.GetNetwork())) {
+    if (!HasAllowedMetric(allowedMetricIds, EResourceToBalance::Network) || !THive::IsValidMetricsNetwork(metrics)) {
         std::get<NMetrics::EResource::Network>(values) = 0;
     }
 }
 
 void TTabletInfo::ActualizeCounter() {
-    auto value = GetCounterValue(ResourceMetricsAggregates, GetTabletAllowedMetricIds());
-    ResourceValues.SetCounter(value);
+    ResourceValues.SetCounter(GetCounterValue());
 }
 
 const TNodeFilter& TTabletInfo::GetNodeFilter() const {

ydb/core/mind/hive/tablet_info.h

@@ -233,7 +233,7 @@ struct TTabletInfo {
     void UpdateResourceUsage(const NKikimrTabletBase::TMetrics& metrics);
     TResourceRawValues GetResourceCurrentValues() const;
     TResourceRawValues GetResourceMaximumValues() const;
-    static i64 GetCounterValue(const TTabletMetricsAggregates& metrics, const TVector<i64>& allowedMetricIds);
+    i64 GetCounterValue() const;
     void FilterRawValues(TResourceRawValues& values) const;
     void FilterRawValues(TResourceNormalizedValues& values) const;
     void ActualizeCounter();