Create simple counter to count success data erasure and timeouts in one iteration of data erasure (#18251)

Author: molotkov-and

ydb/core/tx/schemeshard/schemeshard__data_erasure_manager.h

@@ -27,6 +27,9 @@ class TDataErasureManager {
     ui64 Generation = 0;
     bool Running = false;
 
+    ui64 CounterDataErasureOk = 0;
+    ui64 CounterDataErasureTimeout = 0;
+
 public:
     TDataErasureManager(TSchemeShard* const schemeShard);
 

ydb/core/tx/schemeshard/schemeshard__root_data_erasure_manager.cpp

@@ -111,6 +111,8 @@ void TRootDataErasureManager::ClearWaitingDataErasureRequests() {
 }
 
 void TRootDataErasureManager::Run(NIceDb::TNiceDb& db) {
+    CounterDataErasureOk = 0;
+    CounterDataErasureTimeout = 0;
     Status = EDataErasureStatus::IN_PROGRESS;
     StartTime = AppData(SchemeShard->ActorContext())->TimeProvider->Now();
     for (auto& [pathId, subdomain] : SchemeShard->SubDomains) {
@@ -212,8 +214,8 @@ NOperationQueue::EStartStatus TRootDataErasureManager::StartDataErasure(const TP
 }
 
 void TRootDataErasureManager::OnTimeout(const TPathId& pathId) {
+    CounterDataErasureTimeout++;
     UpdateMetrics();
-    SchemeShard->TabletCounters->Cumulative()[COUNTER_DATA_ERASURE_TIMEOUT].Increment(1);
 
     ActivePipes.erase(pathId);
 
@@ -317,7 +319,7 @@ void TRootDataErasureManager::OnDone(const TPathId& pathId, NIceDb::TNiceDb& db)
         WaitingDataErasureTenants.erase(it);
     }
 
-    SchemeShard->TabletCounters->Cumulative()[COUNTER_DATA_ERASURE_OK].Increment(1);
+    CounterDataErasureOk++;
     UpdateMetrics();
 
     if (WaitingDataErasureTenants.empty()) {
@@ -482,6 +484,8 @@ void TRootDataErasureManager::HandleNewPartitioning(const std::vector<TShardIdx>
 void TRootDataErasureManager::UpdateMetrics() {
     SchemeShard->TabletCounters->Simple()[COUNTER_DATA_ERASURE_QUEUE_SIZE].Set(Queue->Size());
     SchemeShard->TabletCounters->Simple()[COUNTER_DATA_ERASURE_QUEUE_RUNNING].Set(Queue->RunningSize());
+    SchemeShard->TabletCounters->Simple()[COUNTER_DATA_ERASURE_OK].Set(CounterDataErasureOk);
+    SchemeShard->TabletCounters->Simple()[COUNTER_DATA_ERASURE_TIMEOUT].Set(CounterDataErasureTimeout);
 }
 
 TRootDataErasureManager::TQueue::TConfig TRootDataErasureManager::ConvertConfig(const NKikimrConfig::TDataErasureConfig& config) {

ydb/core/tx/schemeshard/schemeshard__tenant_data_erasure_manager.cpp

@@ -112,6 +112,8 @@ void TTenantDataErasureManager::ClearWaitingDataErasureRequests() {
 }
 
 void TTenantDataErasureManager::Run(NIceDb::TNiceDb& db) {
+    CounterDataErasureOk = 0;
+    CounterDataErasureTimeout = 0;
     Status = EDataErasureStatus::IN_PROGRESS;
     for (const auto& [shardIdx, shardInfo] : SchemeShard->ShardInfos) {
         switch (shardInfo.TabletType) {
@@ -200,8 +202,8 @@ NOperationQueue::EStartStatus TTenantDataErasureManager::StartDataErasure(const
 }
 
 void TTenantDataErasureManager::OnTimeout(const TShardIdx& shardIdx) {
+    CounterDataErasureTimeout++;
     UpdateMetrics();
-    SchemeShard->TabletCounters->Cumulative()[COUNTER_TENANT_DATA_ERASURE_TIMEOUT].Increment(1);
 
     ActivePipes.erase(shardIdx);
 
@@ -316,7 +318,7 @@ void TTenantDataErasureManager::OnDone(const TTabletId& tabletId, NIceDb::TNiceD
         }
     }
 
-    SchemeShard->TabletCounters->Cumulative()[COUNTER_TENANT_DATA_ERASURE_OK].Increment(1);
+    CounterDataErasureOk++;
     UpdateMetrics();
 
     if (WaitingDataErasureShards.empty()) {
@@ -446,6 +448,8 @@ void TTenantDataErasureManager::HandleNewPartitioning(const std::vector<TShardId
 void TTenantDataErasureManager::UpdateMetrics() {
     SchemeShard->TabletCounters->Simple()[COUNTER_TENANT_DATA_ERASURE_QUEUE_SIZE].Set(Queue->Size());
     SchemeShard->TabletCounters->Simple()[COUNTER_TENANT_DATA_ERASURE_QUEUE_RUNNING].Set(Queue->RunningSize());
+    SchemeShard->TabletCounters->Simple()[COUNTER_TENANT_DATA_ERASURE_OK].Set(CounterDataErasureOk);
+    SchemeShard->TabletCounters->Simple()[COUNTER_TENANT_DATA_ERASURE_TIMEOUT].Set(CounterDataErasureTimeout);
 }
 
 void TTenantDataErasureManager::SendResponseToRootSchemeShard() {