post-review fixes

Author: swalrus1

ydb/core/tx/columnshard/columnshard__write.cpp

@@ -16,27 +16,21 @@ void TColumnShard::OverloadWriteFail(const EOverloadStatus overloadReason, const
     Counters.GetTabletCounters()->IncCounter(COUNTER_WRITE_FAIL);
     switch (overloadReason) {
         case EOverloadStatus::Disk:
-            Counters.GetTabletCounters()->IncCounter(COUNTER_OUT_OF_SPACE);
+            Counters.GetCSCounters().OnWriteOverloadDisk(writeData.GetSize());
             break;
         case EOverloadStatus::InsertTable:
-            // TODO: Move all IncCounter's below under OnWriteOverload*
-            Counters.GetTabletCounters()->IncCounter(COUNTER_WRITE_OVERLOAD);
             Counters.GetCSCounters().OnWriteOverloadInsertTable(writeData.GetSize());
             break;
         case EOverloadStatus::OverloadMetadata:
-            Counters.GetTabletCounters()->IncCounter(COUNTER_WRITE_OVERLOAD);
             Counters.GetCSCounters().OnWriteOverloadMetadata(writeData.GetSize());
             break;
         case EOverloadStatus::ShardTxInFly:
-            Counters.GetTabletCounters()->IncCounter(COUNTER_WRITE_OVERLOAD);
             Counters.GetCSCounters().OnWriteOverloadShardTx(writeData.GetSize());
             break;
         case EOverloadStatus::ShardWritesInFly:
-            Counters.GetTabletCounters()->IncCounter(COUNTER_WRITE_OVERLOAD);
             Counters.GetCSCounters().OnWriteOverloadShardWrites(writeData.GetSize());
             break;
         case EOverloadStatus::ShardWritesSizeInFly:
-            Counters.GetTabletCounters()->IncCounter(COUNTER_WRITE_OVERLOAD);
             Counters.GetCSCounters().OnWriteOverloadShardWritesSize(writeData.GetSize());
             break;
         case EOverloadStatus::None:

ydb/core/tx/columnshard/counters/columnshard.h

@@ -4,6 +4,7 @@
 #include <library/cpp/monlib/dynamic_counters/counters.h>
 
 #include <util/generic/hash_set.h>
+#include <ydb/core/tx/columnshard/counters/tablet_counters.h>
 
 namespace NKikimr::NColumnShard {
 
@@ -20,6 +21,8 @@ class TCSCounters: public TCommonCountersOwner {
 private:
     using TBase = TCommonCountersOwner;
 
+    std::shared_ptr<TTabletCountersHandle> TabletCounters;
+
     NMonitoring::TDynamicCounters::TCounterPtr StartBackgroundCount;
     NMonitoring::TDynamicCounters::TCounterPtr TooEarlyBackgroundCount;
     NMonitoring::TDynamicCounters::TCounterPtr SetupCompactionCount;
@@ -130,27 +133,36 @@ class TCSCounters: public TCommonCountersOwner {
         SplitCompactionGranulePortionsCount->SetValue(portionsCount);
     }
 
+    void OnWriteOverloadDisk(const ui64 /*size*/) const {
+        TabletCounters->IncCounter(COUNTER_OUT_OF_SPACE);
+    }
+
     void OnWriteOverloadInsertTable(const ui64 size) const {
+        TabletCounters->IncCounter(COUNTER_WRITE_OVERLOAD);
         OverloadInsertTableBytes->Add(size);
         OverloadInsertTableCount->Add(1);
     }
 
     void OnWriteOverloadMetadata(const ui64 size) const {
+        TabletCounters->IncCounter(COUNTER_WRITE_OVERLOAD);
         OverloadMetadataBytes->Add(size);
         OverloadMetadataCount->Add(1);
     }
 
     void OnWriteOverloadShardTx(const ui64 size) const {
+        TabletCounters->IncCounter(COUNTER_WRITE_OVERLOAD);
         OverloadShardTxBytes->Add(size);
         OverloadShardTxCount->Add(1);
     }
 
     void OnWriteOverloadShardWrites(const ui64 size) const {
+        TabletCounters->IncCounter(COUNTER_WRITE_OVERLOAD);
         OverloadShardWritesBytes->Add(size);
         OverloadShardWritesCount->Add(1);
     }
 
     void OnWriteOverloadShardWritesSize(const ui64 size) const {
+        TabletCounters->IncCounter(COUNTER_WRITE_OVERLOAD);
         OverloadShardWritesSizeBytes->Add(size);
         OverloadShardWritesSizeCount->Add(1);
     }