fix

Author: vporyadke

ydb/core/mind/hive/hive_impl.cpp

@@ -1976,7 +1976,7 @@ void THive::FillTabletInfo(NKikimrHive::TEvResponseHiveInfo& response, ui64 tabl
                 }
                 tabletInfo.SetRestartsPerPeriod(follower.GetRestartsPerPeriod(restartsBarrierTime));
                 if (req.GetReturnMetrics()) {
-                    //tabletInfo.MutableMetrics()->CopyFrom(follower.GetResourceValues());
+                    follower.GetResourceValues().ToProto(tabletInfo.MutableMetrics());
                 }
             }
         }
@@ -2717,7 +2717,6 @@ static void AggregateDiff(TMetrics& aggregate, const TMetrics& before, const TMe
     i64 newValue = oldValue + delta;
     Y_ENSURE_LOG(newValue >= 0, "tablet " << tabletId << " name=" << name << " oldValue=" << oldValue << " delta=" << delta << " newValue=" << newValue);
     newValue = Max(newValue, (i64)0);
-    //BLOG_D("AggregateDiff: " << name << " -> " << newValue);
     aggregate.*field = newValue;
 }
 

ydb/core/mind/hive/tx__process_metrics.cpp

@@ -0,0 +1,52 @@
+#include "hive_impl.h"
+#include "hive_log.h"
+
+namespace NKikimr {
+namespace NHive {
+
+class TTxProcessMetrics : public TTransactionBase<THive> {
+    TSideEffects SideEffects;
+
+    static constexpr size_t MAX_UPDATES_PROCESSED = 200;
+public:
+    TTxProcessMetrics(THive* hive)
+        : TBase(hive)
+    {}
+
+    TTxType GetTxType() const override { return NHive::TXTYPE_PROCESS_METRICS; }
+
+    bool Execute(TTransactionContext& txc, const TActorContext&) override {
+        BLOG_D("TTxProcessMetrics::Execute()");
+        NIceDb::TNiceDb db(txc.DB);
+        SideEffects.Reset(Self->SelfId());
+        for (size_t i = 0; !Self->ProcessMetricsQueue.empty() && i < MAX_UPDATES_PROCESSED; ++i) {
+            auto tabletId = Self->ProcessMetricsQueue.front();
+            Self->ProcessMetricsQueue.pop();
+            auto* tablet = Self->FindTablet(tabletId);
+            if (tablet == nullptr) {
+                continue;
+            }
+            tablet->UpdateMetricsEnqueued = false;
+            NKikimrTabletBase::TMetrics protoMetrics;
+            tablet->GetResourceValues().ToProto(&protoMetrics);
+            db.Table<Schema::Metrics>().Key(tabletId).Update<Schema::Metrics::ProtoMetrics>(protoMetrics);
+        }
+        if (Self->ProcessMetricsQueue.empty()) {
+            Self->ProcessMetricsScheduled = false;
+        } else {
+            SideEffects.Send(Self->SelfId(), new TEvPrivate::TEvProcessMetrics);
+        }
+        return true;
+    }
+
+    void Complete(const TActorContext& ctx) override {
+        SideEffects.Complete(ctx);
+    }
+};
+
+ITransaction* THive::CreateProcessMetrics() {
+    return new TTxProcessMetrics(this);
+}
+
+} // NHive
+} // NKikimr