Commit metrics by timer (#14179)

ydb-platform · Feb 4, 2025 · 4595b4e · 4595b4e
1 parent e367c3b
commit 4595b4e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/ydb/core/mind/bscontroller/bsc.cpp b/ydb/core/mind/bscontroller/bsc.cpp
@@ -442,6 +442,7 @@ STFUNC(TBlobStorageController::StateWork) {
         hFunc(TEvBlobStorage::TEvGetBlockResult, ConsoleInteraction->Handle);
         fFunc(TEvBlobStorage::EvControllerShredRequest, EnqueueIncomingEvent);
         cFunc(TEvPrivate::EvUpdateShredState, ShredState.HandleUpdateShredState);
+        cFunc(TEvPrivate::EvCommitMetrics, CommitMetrics);
         default:
             if (!HandleDefaultEvents(ev, SelfId())) {
                 STLOG(PRI_ERROR, BS_CONTROLLER, BSC06, "StateWork unexpected event", (Type, type),

diff --git a/ydb/core/mind/bscontroller/disk_metrics.cpp b/ydb/core/mind/bscontroller/disk_metrics.cpp
@@ -52,7 +52,10 @@ class TBlobStorageController::TTxUpdateDiskMetrics : public TTransactionBase<TBl
         return true;
     }
 
-    void Complete(const TActorContext&) override {}
+    void Complete(const TActorContext&) override {
+        TActivationContext::Schedule(TDuration::Seconds(15), new IEventHandle(TEvPrivate::EvCommitMetrics, 0,
+            Self->SelfId(), TActorId(), nullptr, 0));
+    }
 };
 
 void TBlobStorageController::Handle(TEvBlobStorage::TEvControllerUpdateDiskStatus::TPtr &ev) {
@@ -116,12 +119,10 @@ void TBlobStorageController::Handle(TEvBlobStorage::TEvControllerUpdateDiskStatu
 
     // process VDisk status
     ProcessVDiskStatus(record.GetVDiskStatus());
+}
 
-    // commit into database if enough time has passed
-    if (now - LastMetricsCommit >= TDuration::Seconds(15)) {
-        Execute(new TTxUpdateDiskMetrics(this));
-        LastMetricsCommit = now;
-    }
+void TBlobStorageController::CommitMetrics() {
+    Execute(new TTxUpdateDiskMetrics(this));
 }
 
 } // NKikimr::NBsController
diff --git a/ydb/core/mind/bscontroller/impl.h b/ydb/core/mind/bscontroller/impl.h
@@ -1547,7 +1547,6 @@ class TBlobStorageController : public TActor<TBlobStorageController>, public TTa
     TMap<TGroupId, TBlobDepotDeleteQueueInfo> BlobDepotDeleteQueue;
     ui64 NextOperationLogIndex = 1;
     TActorId StatProcessorActorId;
-    TInstant LastMetricsCommit;
     bool SelfHealEnable = false;
     bool UseSelfHealLocalPolicy = false;
     bool TryToRelocateBrokenDisksLocallyFirst = false;
@@ -1603,6 +1602,7 @@ class TBlobStorageController : public TActor<TBlobStorageController>, public TTa
             EvProcessIncomingEvent,
             EvUpdateHostRecords,
             EvUpdateShredState,
+            EvCommitMetrics,
         };
 
         struct TEvUpdateSystemViews : public TEventLocal<TEvUpdateSystemViews, EvUpdateSystemViews> {};
@@ -1826,6 +1826,8 @@ class TBlobStorageController : public TActor<TBlobStorageController>, public TTa
     void Handle(TEvInterconnect::TEvNodesInfo::TPtr &ev);
     void OnHostRecordsInitiate();
 
+    void CommitMetrics();
+
 public:
     // Self-heal actor's main purpose is to monitor FAULTY pdisks and to slightly move groups out of them; every move
     // should not render group unusable, also it should not exceed its fail model. It also takes into account replication
@@ -2177,6 +2179,7 @@ class TBlobStorageController : public TActor<TBlobStorageController>, public TTa
         }
 
         ShredState.Initialize();
+        CommitMetrics();
     }
 
     void UpdatePDisksCounters() {