fix logical capacity metric

Signed-off-by: Hanqing Wu <wuhanqing@corp.netease.com>
opencurve · Sep 26, 2023 · cf85cce · cf85cce
1 parent cef01cd
commit cf85cce
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 9 deletions.
diff --git a/src/mds/server/mds.cpp b/src/mds/server/mds.cpp
@@ -352,7 +352,8 @@ void MDS::InitTopologyMetricService(const TopologyOption& option) {
     topologyMetricService_ =
         std::make_shared<TopologyMetricService>(topology_,
             topologyStat_,
-            segmentAllocStatistic_);
+            segmentAllocStatistic_,
+            chunkFilePoolAllocHelp_);
     LOG_IF(FATAL, topologyMetricService_->Init(option) < 0)
         << "init topologyMetricService fail.";
     LOG(INFO) << "init topologyMetricService success.";
@@ -397,7 +398,7 @@ void MDS::InitCopysetOption(CopysetOption *copysetOption) {
 
 
 void MDS::InitTopologyChunkAllocator(const TopologyOption& option) {
-    std::shared_ptr<ChunkFilePoolAllocHelp> chunkFilePoolAllocHelp_ =
+    chunkFilePoolAllocHelp_ =
           std::make_shared<ChunkFilePoolAllocHelp>();
     topologyChunkAllocator_ =
           std::make_shared<TopologyChunkAllocatorImpl>(topology_,

diff --git a/src/mds/server/mds.h b/src/mds/server/mds.h
@@ -221,6 +221,7 @@ class MDS {
     std::shared_ptr<NameServerStorage> nameServerStorage_;
     std::shared_ptr<TopologyImpl> topology_;
     std::shared_ptr<TopologyStatImpl> topologyStat_;
+    std::shared_ptr<ChunkFilePoolAllocHelp> chunkFilePoolAllocHelp_;
     std::shared_ptr<TopologyChunkAllocator> topologyChunkAllocator_;
     std::shared_ptr<TopologyMetricService> topologyMetricService_;
     std::shared_ptr<TopologyServiceManager> topologyServiceManager_;

diff --git a/src/mds/topology/topology_chunk_allocator.h b/src/mds/topology/topology_chunk_allocator.h
@@ -114,12 +114,12 @@ class TopologyChunkAllocatorImpl : public TopologyChunkAllocator {
     TopologyChunkAllocatorImpl(std::shared_ptr<Topology> topology,
         std::shared_ptr<AllocStatistic> allocStatistic,
         std::shared_ptr<TopologyStat> topologyStat,
-        std::shared_ptr<ChunkFilePoolAllocHelp> ChunkFilePoolAllocHelp,
+        std::shared_ptr<ChunkFilePoolAllocHelp> chunkFilePoolAllocHelp,
         const TopologyOption &option)
         : topology_(topology),
         allocStatistic_(allocStatistic),
         topoStat_(topologyStat),
-        chunkFilePoolAllocHelp_(ChunkFilePoolAllocHelp),
+        chunkFilePoolAllocHelp_(chunkFilePoolAllocHelp),
         available_(option.PoolUsagePercentLimit),
         policy_(static_cast<ChoosePoolPolicy>(option.choosePoolPolicy)),
         enableLogicalPoolStatus_(option.enableLogicalPoolStatus) {

diff --git a/src/mds/topology/topology_metric.cpp b/src/mds/topology/topology_metric.cpp
@@ -216,8 +216,18 @@ void TopologyMetricService::UpdateTopologyMetrics() {
         it->second->chunkSizeTrashedBytes.set_value(totalChunkSizeTrashedBytes);
         it->second->chunkSizeTotalBytes.set_value(totalChunkSizeBytes);
         if (pool.GetReplicaNum() != 0) {
-            it->second->logicalCapacity.set_value(
-                totalChunkSizeBytes / pool.GetReplicaNum());
+            if (chunkFilePoolAllocHelp_->GetUseChunkFilepool()) {
+                uint64_t diskCapacity = 0;
+                topoStat_->GetChunkPoolSize(pool.GetPhysicalPoolId(),
+                            &diskCapacity);
+                diskCapacity = diskCapacity *
+                    chunkFilePoolAllocHelp_->GetAvailable() / 100;
+                it->second->logicalCapacity.set_value(
+                   diskCapacity  / pool.GetReplicaNum());
+            } else {
+                it->second->logicalCapacity.set_value(
+                    totalChunkSizeBytes / pool.GetReplicaNum());
+            }
         }
 
         uint64_t readRate = 0, writeRate = 0,

diff --git a/src/mds/topology/topology_metric.h b/src/mds/topology/topology_metric.h
@@ -34,6 +34,7 @@
 #include "src/mds/topology/topology_stat.h"
 #include "src/mds/nameserver2/allocstatistic/alloc_statistic.h"
 #include "src/common/interruptible_sleeper.h"
+#include "src/mds/topology/topology_chunk_allocator.h"
 
 using ::curve::common::InterruptibleSleeper;
 
@@ -389,11 +390,13 @@ class TopologyMetricService {
 
  public:
      TopologyMetricService(std::shared_ptr<Topology> topo,
-        std::shared_ptr<TopologyStat> topoStat,
-        std::shared_ptr<AllocStatistic> allocStatistic)
+        const std::shared_ptr<TopologyStat> &topoStat,
+        const std::shared_ptr<AllocStatistic> &allocStatistic,
+        const std::shared_ptr<ChunkFilePoolAllocHelp> &chunkFilePoolAllocHelp)
         : topo_(topo),
           topoStat_(topoStat),
           allocStatistic_(allocStatistic),
+          chunkFilePoolAllocHelp_(chunkFilePoolAllocHelp),
           isStop_(true) {}
     ~TopologyMetricService() {
         Stop();
@@ -446,6 +449,8 @@ class TopologyMetricService {
      * @brief allocation statistic module
      */
     std::shared_ptr<AllocStatistic> allocStatistic_;
+
+    std::shared_ptr<ChunkFilePoolAllocHelp> chunkFilePoolAllocHelp_;
     /**
      * @brief backend thread
      */

diff --git a/test/mds/topology/test_topology_metric.cpp b/test/mds/topology/test_topology_metric.cpp
@@ -51,10 +51,13 @@ class TestTopologyMetric : public ::testing::Test {
                                                tokenGenerator_,
                                                storage_);
 
+
+        std::shared_ptr<ChunkFilePoolAllocHelp> chunkFilePoolAllocHelp =
+            std::make_shared<ChunkFilePoolAllocHelp>();
         topologyStat_ = std::make_shared<MockTopologyStat>();
         allocStatistic_ = std::make_shared<MockAllocStatistic>();
         testObj_ = std::make_shared<TopologyMetricService>(
-            topology_, topologyStat_, allocStatistic_);
+            topology_, topologyStat_, allocStatistic_, chunkFilePoolAllocHelp);
     }
 
     void TearDown() {