split counters/columnshard.h, change schema opType

ydb-platform · Aug 2, 2024 · e1c0faa · e1c0faa
1 parent 09b966a
commit e1c0faa
Show file tree

Hide file tree

Showing 4 changed files with 164 additions and 132 deletions.
diff --git a/ydb/core/tx/columnshard/counters/columnshard.h b/ydb/core/tx/columnshard/counters/columnshard.h
@@ -1,5 +1,7 @@
 #pragma once
 #include "common/owner.h"
+#include "initialization.h"
+#include "tx_progress.h"
 
 #include <ydb/core/tx/columnshard/counters/tablet_counters.h>
 
@@ -17,137 +19,6 @@ enum class EWriteFailReason {
     Overload /* "overload" */
 };
 
-class TCSInitialization: public TCommonCountersOwner {
-private:
-    using TBase = TCommonCountersOwner;
-
-    const NMonitoring::THistogramPtr HistogramTabletInitializationMs;
-    const NMonitoring::THistogramPtr HistogramTxInitDurationMs;
-    const NMonitoring::THistogramPtr HistogramTxUpdateSchemaDurationMs;
-    const NMonitoring::THistogramPtr HistogramTxInitSchemaDurationMs;
-    const NMonitoring::THistogramPtr HistogramActivateExecutorFromActivationDurationMs;
-    const NMonitoring::THistogramPtr HistogramSwitchToWorkFromActivationDurationMs;
-    const NMonitoring::THistogramPtr HistogramSwitchToWorkFromCreateDurationMs;
-
-public:
-    void OnTxInitFinished(const TDuration d) const {
-        HistogramTxInitDurationMs->Collect(d.MilliSeconds());
-    }
-
-    void OnTxUpdateSchemaFinished(const TDuration d) const {
-        HistogramTxUpdateSchemaDurationMs->Collect(d.MilliSeconds());
-    }
-
-    void OnTxInitSchemaFinished(const TDuration d) const {
-        HistogramTxInitSchemaDurationMs->Collect(d.MilliSeconds());
-    }
-
-    void OnActivateExecutor(const TDuration fromCreate) const {
-        HistogramActivateExecutorFromActivationDurationMs->Collect(fromCreate.MilliSeconds());
-    }
-    void OnSwitchToWork(const TDuration fromStart, const TDuration fromCreate) const {
-        HistogramSwitchToWorkFromActivationDurationMs->Collect(fromStart.MilliSeconds());
-        HistogramSwitchToWorkFromCreateDurationMs->Collect(fromCreate.MilliSeconds());
-    }
-
-    TCSInitialization(TCommonCountersOwner& owner)
-        : TBase(owner, "stage", "initialization")
-        , HistogramTabletInitializationMs(TBase::GetHistogram("TabletInitializationMs", NMonitoring::ExponentialHistogram(15, 2, 32)))
-        , HistogramTxInitDurationMs(TBase::GetHistogram("TxInitDurationMs", NMonitoring::ExponentialHistogram(15, 2, 32)))
-        , HistogramTxUpdateSchemaDurationMs(TBase::GetHistogram("TxInitDurationMs", NMonitoring::ExponentialHistogram(15, 2, 32)))
-        , HistogramTxInitSchemaDurationMs(TBase::GetHistogram("TxInitSchemaDurationMs", NMonitoring::ExponentialHistogram(15, 2, 32)))
-        , HistogramActivateExecutorFromActivationDurationMs(
-              TBase::GetHistogram("ActivateExecutorFromActivationDurationMs", NMonitoring::ExponentialHistogram(15, 2, 32)))
-        , HistogramSwitchToWorkFromActivationDurationMs(
-              TBase::GetHistogram("SwitchToWorkFromActivationDurationMs", NMonitoring::ExponentialHistogram(15, 2, 32)))
-        , HistogramSwitchToWorkFromCreateDurationMs(
-              TBase::GetHistogram("SwitchToWorkFromCreateDurationMs", NMonitoring::ExponentialHistogram(15, 2, 32))) {
-    }
-};
-
-class TTxProgressCounters: public TCommonCountersOwner {
-private:
-    using TBase = TCommonCountersOwner;
-    using TOpType = TString;
-
-    class TProgressCounters: public TCommonCountersOwner {
-    private:
-        using TBase = TCommonCountersOwner;
-
-    public:
-        NMonitoring::TDynamicCounters::TCounterPtr RegisterTx;
-        NMonitoring::TDynamicCounters::TCounterPtr RegisterTxWithDeadline;
-        NMonitoring::TDynamicCounters::TCounterPtr StartProposeOnExecute;
-        NMonitoring::TDynamicCounters::TCounterPtr StartProposeOnComplete;
-        NMonitoring::TDynamicCounters::TCounterPtr FinishProposeOnExecute;
-        NMonitoring::TDynamicCounters::TCounterPtr FinishProposeOnComplete;
-        NMonitoring::TDynamicCounters::TCounterPtr FinishPlannedTx;
-        NMonitoring::TDynamicCounters::TCounterPtr AbortTx;
-
-        TProgressCounters(const TCommonCountersOwner& owner)
-            : TBase(owner)
-            , RegisterTx(TBase::GetDeriviative("RegisterTx"))
-            , RegisterTxWithDeadline(TBase::GetDeriviative("RegisterTxWithDeadline"))
-            , StartProposeOnExecute(TBase::GetDeriviative("StartProposeOnExecute"))
-            , StartProposeOnComplete(TBase::GetDeriviative("StartProposeOnComplete"))
-            , FinishProposeOnExecute(TBase::GetDeriviative("FinishProposeOnExecute"))
-            , FinishProposeOnComplete(TBase::GetDeriviative("FinishProposeOnComplete"))
-            , FinishPlannedTx(TBase::GetDeriviative("FinishPlannedTx"))
-            , AbortTx(TBase::GetDeriviative("AbortTx")) {
-        }
-    };
-
-    THashMap<TOpType, TProgressCounters> CountersByOpType;
-
-public:
-    void OnRegisterTx(const TOpType& opType) {
-        GetSubGroup(opType).RegisterTx->Add(1);
-    }
-
-    void OnRegisterTxWithDeadline(const TOpType& opType) {
-        GetSubGroup(opType).RegisterTxWithDeadline->Add(1);
-    }
-
-    void OnStartProposeOnExecute(const TOpType& opType) {
-        GetSubGroup(opType).StartProposeOnExecute->Add(1);
-    }
-
-    void OnStartProposeOnComplete(const TOpType& opType) {
-        GetSubGroup(opType).StartProposeOnComplete->Add(1);
-    }
-
-    void OnFinishProposeOnExecute(const TOpType& opType) {
-        GetSubGroup(opType).FinishProposeOnExecute->Add(1);
-    }
-
-    void OnFinishProposeOnComplete(const TOpType& opType) {
-        GetSubGroup(opType).FinishProposeOnComplete->Add(1);
-    }
-
-    void OnFinishPlannedTx(const TOpType& opType) {
-        GetSubGroup(opType).FinishPlannedTx->Add(1);
-    }
-
-    void OnAbortTx(const TOpType& opType) {
-        GetSubGroup(opType).AbortTx->Add(1);
-    }
-
-    TTxProgressCounters(TCommonCountersOwner& owner)
-        : TBase(owner, "TxProgress") {
-    }
-
-private:
-    TProgressCounters& GetSubGroup(const TOpType& opType) {
-        auto findSubGroup = CountersByOpType.FindPtr(opType);
-        if (findSubGroup) {
-            return *findSubGroup;
-        }
-
-        auto subGroup = TBase::CreateSubGroup("operation", opType);
-        return CountersByOpType.emplace(opType, subGroup).first->second;
-    }
-};
-
 class TCSCounters: public TCommonCountersOwner {
 private:
     using TBase = TCommonCountersOwner;

diff --git a/ydb/core/tx/columnshard/counters/initialization.h b/ydb/core/tx/columnshard/counters/initialization.h
@@ -0,0 +1,56 @@
+#pragma once
+#include "common/owner.h"
+
+#include <library/cpp/monlib/dynamic_counters/counters.h>
+
+namespace NKikimr::NColumnShard {
+
+class TCSInitialization: public TCommonCountersOwner {
+private:
+    using TBase = TCommonCountersOwner;
+
+    const NMonitoring::THistogramPtr HistogramTabletInitializationMs;
+    const NMonitoring::THistogramPtr HistogramTxInitDurationMs;
+    const NMonitoring::THistogramPtr HistogramTxUpdateSchemaDurationMs;
+    const NMonitoring::THistogramPtr HistogramTxInitSchemaDurationMs;
+    const NMonitoring::THistogramPtr HistogramActivateExecutorFromActivationDurationMs;
+    const NMonitoring::THistogramPtr HistogramSwitchToWorkFromActivationDurationMs;
+    const NMonitoring::THistogramPtr HistogramSwitchToWorkFromCreateDurationMs;
+
+public:
+    void OnTxInitFinished(const TDuration d) const {
+        HistogramTxInitDurationMs->Collect(d.MilliSeconds());
+    }
+
+    void OnTxUpdateSchemaFinished(const TDuration d) const {
+        HistogramTxUpdateSchemaDurationMs->Collect(d.MilliSeconds());
+    }
+
+    void OnTxInitSchemaFinished(const TDuration d) const {
+        HistogramTxInitSchemaDurationMs->Collect(d.MilliSeconds());
+    }
+
+    void OnActivateExecutor(const TDuration fromCreate) const {
+        HistogramActivateExecutorFromActivationDurationMs->Collect(fromCreate.MilliSeconds());
+    }
+    void OnSwitchToWork(const TDuration fromStart, const TDuration fromCreate) const {
+        HistogramSwitchToWorkFromActivationDurationMs->Collect(fromStart.MilliSeconds());
+        HistogramSwitchToWorkFromCreateDurationMs->Collect(fromCreate.MilliSeconds());
+    }
+
+    TCSInitialization(TCommonCountersOwner& owner)
+        : TBase(owner, "stage", "initialization")
+        , HistogramTabletInitializationMs(TBase::GetHistogram("TabletInitializationMs", NMonitoring::ExponentialHistogram(15, 2, 32)))
+        , HistogramTxInitDurationMs(TBase::GetHistogram("TxInitDurationMs", NMonitoring::ExponentialHistogram(15, 2, 32)))
+        , HistogramTxUpdateSchemaDurationMs(TBase::GetHistogram("TxInitDurationMs", NMonitoring::ExponentialHistogram(15, 2, 32)))
+        , HistogramTxInitSchemaDurationMs(TBase::GetHistogram("TxInitSchemaDurationMs", NMonitoring::ExponentialHistogram(15, 2, 32)))
+        , HistogramActivateExecutorFromActivationDurationMs(
+              TBase::GetHistogram("ActivateExecutorFromActivationDurationMs", NMonitoring::ExponentialHistogram(15, 2, 32)))
+        , HistogramSwitchToWorkFromActivationDurationMs(
+              TBase::GetHistogram("SwitchToWorkFromActivationDurationMs", NMonitoring::ExponentialHistogram(15, 2, 32)))
+        , HistogramSwitchToWorkFromCreateDurationMs(
+              TBase::GetHistogram("SwitchToWorkFromCreateDurationMs", NMonitoring::ExponentialHistogram(15, 2, 32))) {
+    }
+};
+
+}
diff --git a/ydb/core/tx/columnshard/counters/tx_progress.h b/ydb/core/tx/columnshard/counters/tx_progress.h
@@ -0,0 +1,92 @@
+#pragma once
+#include "common/owner.h"
+
+#include <library/cpp/monlib/dynamic_counters/counters.h>
+#include <util/generic/hash.h>
+
+namespace NKikimr::NColumnShard {
+
+class TTxProgressCounters: public TCommonCountersOwner {
+private:
+    using TBase = TCommonCountersOwner;
+    using TOpType = TString;
+
+    class TProgressCounters: public TCommonCountersOwner {
+    private:
+        using TBase = TCommonCountersOwner;
+
+    public:
+        NMonitoring::TDynamicCounters::TCounterPtr RegisterTx;
+        NMonitoring::TDynamicCounters::TCounterPtr RegisterTxWithDeadline;
+        NMonitoring::TDynamicCounters::TCounterPtr StartProposeOnExecute;
+        NMonitoring::TDynamicCounters::TCounterPtr StartProposeOnComplete;
+        NMonitoring::TDynamicCounters::TCounterPtr FinishProposeOnExecute;
+        NMonitoring::TDynamicCounters::TCounterPtr FinishProposeOnComplete;
+        NMonitoring::TDynamicCounters::TCounterPtr FinishPlannedTx;
+        NMonitoring::TDynamicCounters::TCounterPtr AbortTx;
+
+        TProgressCounters(const TCommonCountersOwner& owner)
+            : TBase(owner)
+            , RegisterTx(TBase::GetDeriviative("RegisterTx"))
+            , RegisterTxWithDeadline(TBase::GetDeriviative("RegisterTxWithDeadline"))
+            , StartProposeOnExecute(TBase::GetDeriviative("StartProposeOnExecute"))
+            , StartProposeOnComplete(TBase::GetDeriviative("StartProposeOnComplete"))
+            , FinishProposeOnExecute(TBase::GetDeriviative("FinishProposeOnExecute"))
+            , FinishProposeOnComplete(TBase::GetDeriviative("FinishProposeOnComplete"))
+            , FinishPlannedTx(TBase::GetDeriviative("FinishPlannedTx"))
+            , AbortTx(TBase::GetDeriviative("AbortTx")) {
+        }
+    };
+
+    THashMap<TOpType, TProgressCounters> CountersByOpType;
+
+public:
+    void OnRegisterTx(const TOpType& opType) {
+        GetSubGroup(opType).RegisterTx->Add(1);
+    }
+
+    void OnRegisterTxWithDeadline(const TOpType& opType) {
+        GetSubGroup(opType).RegisterTxWithDeadline->Add(1);
+    }
+
+    void OnStartProposeOnExecute(const TOpType& opType) {
+        GetSubGroup(opType).StartProposeOnExecute->Add(1);
+    }
+
+    void OnStartProposeOnComplete(const TOpType& opType) {
+        GetSubGroup(opType).StartProposeOnComplete->Add(1);
+    }
+
+    void OnFinishProposeOnExecute(const TOpType& opType) {
+        GetSubGroup(opType).FinishProposeOnExecute->Add(1);
+    }
+
+    void OnFinishProposeOnComplete(const TOpType& opType) {
+        GetSubGroup(opType).FinishProposeOnComplete->Add(1);
+    }
+
+    void OnFinishPlannedTx(const TOpType& opType) {
+        GetSubGroup(opType).FinishPlannedTx->Add(1);
+    }
+
+    void OnAbortTx(const TOpType& opType) {
+        GetSubGroup(opType).AbortTx->Add(1);
+    }
+
+    TTxProgressCounters(TCommonCountersOwner& owner)
+        : TBase(owner, "TxProgress") {
+    }
+
+private:
+    TProgressCounters& GetSubGroup(const TOpType& opType) {
+        auto findSubGroup = CountersByOpType.FindPtr(opType);
+        if (findSubGroup) {
+            return *findSubGroup;
+        }
+
+        auto subGroup = TBase::CreateSubGroup("operation", opType);
+        return CountersByOpType.emplace(opType, subGroup).first->second;
+    }
+};
+
+}
diff --git a/ydb/core/tx/columnshard/transactions/operators/schema.h b/ydb/core/tx/columnshard/transactions/operators/schema.h
@@ -44,7 +44,20 @@ class TSchemaTransactionOperator: public IProposeTxOperator {
     virtual void DoFinishProposeOnComplete(TColumnShard& /*owner*/, const TActorContext& /*ctx*/) override {
     }
     virtual TString DoGetOpType() const override {
-        return "Scheme";
+        switch (SchemaTxBody.TxBody_case()) {
+            case NKikimrTxColumnShard::TSchemaTxBody::kInitShard:
+                return "Scheme:InitShard";
+            case NKikimrTxColumnShard::TSchemaTxBody::kEnsureTables:
+                return "Scheme:EnsureTables";
+            case NKikimrTxColumnShard::TSchemaTxBody::kAlterTable:
+                return "Scheme:AlterTable";
+            case NKikimrTxColumnShard::TSchemaTxBody::kAlterStore:
+                return "Scheme:AlterStore";
+            case NKikimrTxColumnShard::TSchemaTxBody::kDropTable:
+                return "Scheme:DropTable";
+            case NKikimrTxColumnShard::TSchemaTxBody::TXBODY_NOT_SET:
+                return "Scheme:TXBODY_NOT_SET";
+        }
     }
     virtual bool DoIsAsync() const override {
         return WaitPathIdsToErase.size();