add metrics for storage pool run mode (#4881)

close #4870
pingcap · May 13, 2022 · b8e58eb · b8e58eb
1 parent 08e2d2d
commit b8e58eb
Show file tree

Hide file tree

Showing 6 changed files with 314 additions and 3 deletions.
diff --git a/dbms/src/Common/CurrentMetrics.cpp b/dbms/src/Common/CurrentMetrics.cpp
@@ -78,7 +78,12 @@
     M(IOLimiterPendingBgWriteReq)               \
     M(IOLimiterPendingFgWriteReq)               \
     M(IOLimiterPendingBgReadReq)                \
-    M(IOLimiterPendingFgReadReq)
+    M(IOLimiterPendingFgReadReq)                \
+    M(StoragePoolV2Only)                        \
+    M(StoragePoolV3Only)                        \
+    M(StoragePoolMixMode)                       \
+    M(RegionPersisterRunMode)                   \
+    M(GlobalStorageRunMode)
 
 namespace CurrentMetrics
 {

diff --git a/dbms/src/Interpreters/Context.cpp b/dbms/src/Interpreters/Context.cpp
@@ -81,6 +81,7 @@ namespace CurrentMetrics
 {
 extern const Metric ContextLockWait;
 extern const Metric MemoryTrackingForMerges;
+extern const Metric GlobalStorageRunMode;
 } // namespace CurrentMetrics
 
 
@@ -1652,7 +1653,7 @@ bool Context::initializeGlobalStoragePoolIfNeed(const PathPool & path_pool)
         // GlobalStoragePool may be initialized many times in some test cases for restore.
         LOG_WARNING(shared->log, "GlobalStoragePool has already been initialized.");
     }
-
+    CurrentMetrics::set(CurrentMetrics::GlobalStorageRunMode, static_cast<UInt8>(shared->storage_run_mode));
     if (shared->storage_run_mode == PageStorageRunMode::MIX_MODE || shared->storage_run_mode == PageStorageRunMode::ONLY_V3)
     {
         try

diff --git a/dbms/src/Storages/DeltaMerge/StoragePool.cpp b/dbms/src/Storages/DeltaMerge/StoragePool.cpp
@@ -12,13 +12,22 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <Common/CurrentMetrics.h>
 #include <Common/FailPoint.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/Settings.h>
 #include <Storages/DeltaMerge/StoragePool.h>
 #include <Storages/Page/ConfigSettings.h>
 #include <fmt/format.h>
 
+
+namespace CurrentMetrics
+{
+extern const Metric StoragePoolV2Only;
+extern const Metric StoragePoolV3Only;
+extern const Metric StoragePoolMixMode;
+} // namespace CurrentMetrics
+
 namespace DB
 {
 namespace ErrorCodes
@@ -30,6 +39,7 @@ namespace FailPoints
 {
 extern const char force_set_dtfile_exist_when_acquire_id[];
 } // namespace FailPoints
+
 namespace DM
 {
 enum class StorageType
@@ -159,6 +169,7 @@ StoragePool::StoragePool(Context & global_ctx, NamespaceId ns_id_, StoragePathPo
     , run_mode(global_ctx.getPageStorageRunMode())
     , ns_id(ns_id_)
     , global_context(global_ctx)
+    , storage_pool_metrics(CurrentMetrics::StoragePoolV3Only, 0)
 {
     const auto & global_storage_pool = global_context.getGlobalStoragePool();
     switch (run_mode)
@@ -200,7 +211,6 @@ StoragePool::StoragePool(Context & global_ctx, NamespaceId ns_id_, StoragePathPo
         log_storage_writer = std::make_shared<PageWriter>(run_mode, /*storage_v2_*/ nullptr, log_storage_v3);
         data_storage_writer = std::make_shared<PageWriter>(run_mode, /*storage_v2_*/ nullptr, data_storage_v3);
         meta_storage_writer = std::make_shared<PageWriter>(run_mode, /*storage_v2_*/ nullptr, meta_storage_v3);
-
         break;
     }
     case PageStorageRunMode::MIX_MODE:
@@ -303,6 +313,7 @@ PageStorageRunMode StoragePool::restore()
         max_data_page_id = data_max_ids[0];
         max_meta_page_id = meta_max_ids[0];
 
+        storage_pool_metrics = CurrentMetrics::Increment{CurrentMetrics::StoragePoolV2Only};
         break;
     }
     case PageStorageRunMode::ONLY_V3:
@@ -311,6 +322,7 @@ PageStorageRunMode StoragePool::restore()
         max_data_page_id = global_storage_pool->getDataMaxId(ns_id);
         max_meta_page_id = global_storage_pool->getMetaMaxId(ns_id);
 
+        storage_pool_metrics = CurrentMetrics::Increment{CurrentMetrics::StoragePoolV3Only};
         break;
     }
     case PageStorageRunMode::MIX_MODE:
@@ -368,12 +380,14 @@ PageStorageRunMode StoragePool::restore()
             max_meta_page_id = global_storage_pool->getMetaMaxId(ns_id);
 
             run_mode = PageStorageRunMode::ONLY_V3;
+            storage_pool_metrics = CurrentMetrics::Increment{CurrentMetrics::StoragePoolV3Only};
         }
         else // Still running Mix Mode
         {
             max_log_page_id = std::max(v2_log_max_ids[0], global_storage_pool->getLogMaxId(ns_id));
             max_data_page_id = std::max(v2_data_max_ids[0], global_storage_pool->getDataMaxId(ns_id));
             max_meta_page_id = std::max(v2_meta_max_ids[0], global_storage_pool->getMetaMaxId(ns_id));
+            storage_pool_metrics = CurrentMetrics::Increment{CurrentMetrics::StoragePoolMixMode};
         }
         break;
     }

diff --git a/dbms/src/Storages/DeltaMerge/StoragePool.h b/dbms/src/Storages/DeltaMerge/StoragePool.h
@@ -235,6 +235,8 @@ class StoragePool : private boost::noncopyable
     std::atomic<PageId> max_meta_page_id = 0;
 
     BackgroundProcessingPool::TaskHandle gc_handle = nullptr;
+
+    CurrentMetrics::Increment storage_pool_metrics;
 };
 
 struct StorageSnapshot : private boost::noncopyable

diff --git a/dbms/src/Storages/Transaction/RegionPersister.cpp b/dbms/src/Storages/Transaction/RegionPersister.cpp
@@ -28,6 +28,11 @@
 
 #include <memory>
 
+namespace CurrentMetrics
+{
+extern const Metric RegionPersisterRunMode;
+}
+
 namespace DB
 {
 namespace ErrorCodes
@@ -320,6 +325,7 @@ RegionMap RegionPersister::restore(const TiFlashRaftProxyHelper * proxy_helper,
         }
         }
 
+        CurrentMetrics::set(CurrentMetrics::RegionPersisterRunMode, static_cast<UInt8>(run_mode));
         LOG_FMT_INFO(log, "RegionPersister running. Current Run Mode is {}", static_cast<UInt8>(run_mode));
     }