CurveBS: curve_ops_tool show space usage of every logicalpool

Signed-off-by: Zhao ZeYu <[email protected]>

Author: yubindy

src/tools/status_tool.cpp

@@ -211,6 +211,17 @@ int StatusTool::SpaceCmd() {
               << ", created file size = "
               << spaceInfo.currentFileSize / mds::kGB
               << "GB(" << createdFileRatio * 100 << "%)" << std::endl;
+
+    std::cout << "Every Logicalpool Space info:" << std::endl;
+    for (const auto &i : spaceInfo.lpoolspaceinfo) {
+    std::cout << "logicalPool: name = "<< i.second.poolName
+              << ", poolid = " << i.first
+              << ", total = "<< i.second.totalCapacity / mds::kGB << "GB"
+              << ", used = " << i.second.allocatedSize / mds::kGB << "GB"
+              << ", left = " << (i.second.totalCapacity -
+                                i.second.allocatedSize) / mds::kGB
+              << "GB"<< std::endl;
+    }
     return 0;
 }
 
@@ -1045,7 +1056,9 @@ int StatusTool::GetSpaceInfo(SpaceInfo* spaceInfo) {
     }
     // 从metric获取space信息
     for (const auto& lgPool : lgPools) {
+        LogicalpoolSpaceInfo   lpinfo;
         std::string poolName = lgPool.logicalpoolname();
+        lpinfo.poolName = poolName;
         std::string metricName = GetPoolTotalChunkSizeName(poolName);
         uint64_t size;
         int res = mdsClient_->GetMetric(metricName, &size);
@@ -1054,27 +1067,34 @@ int StatusTool::GetSpaceInfo(SpaceInfo* spaceInfo) {
             return -1;
         }
         spaceInfo->totalChunkSize += size;
+        lpinfo.totalChunkSize +=size;
         metricName = GetPoolUsedChunkSizeName(poolName);
         res = mdsClient_->GetMetric(metricName, &size);
         if (res != 0) {
             std::cout << "Get used chunk byte from mds fail!" << std::endl;
             return -1;
         }
         spaceInfo->usedChunkSize += size;
+        lpinfo.usedChunkSize += size;
         metricName = GetPoolLogicalCapacityName(poolName);
         res = mdsClient_->GetMetric(metricName, &size);
         if (res != 0) {
             std::cout << "Get logical capacity from mds fail!" << std::endl;
             return -1;
         }
         spaceInfo->totalCapacity += size;
+        lpinfo.totalCapacity += size;
         metricName = GetPoolLogicalAllocName(poolName);
         res = mdsClient_->GetMetric(metricName, &size);
         if (res != 0) {
             std::cout << "Get logical alloc size from mds fail!" << std::endl;
             return -1;
         }
         spaceInfo->allocatedSize += size;
+        lpinfo.allocatedSize += size;
+        spaceInfo->lpoolspaceinfo.insert(
+                std::pair<uint32_t, LogicalpoolSpaceInfo>(
+                    lgPool.logicalpoolid(), lpinfo));
     }
     // 获取RecycleBin的分配大小
     res = mdsClient_->GetAllocatedSize(curve::mds::RECYCLEBINDIR,

src/tools/status_tool.h

@@ -32,6 +32,7 @@
 #include <string>
 #include <memory>
 #include <map>
+#include <unordered_map>
 #include "proto/topology.pb.h"
 #include "src/common/timeutility.h"
 #include "src/mds/common/mds_define.h"
@@ -58,6 +59,16 @@ using curve::mds::topology::ChunkServerInfo;
 
 namespace curve {
 namespace tool {
+struct LogicalpoolSpaceInfo {
+    std::string poolName = "";
+    uint64_t totalChunkSize = 0;
+    uint64_t usedChunkSize = 0;
+    // 总体能容纳的文件大小
+    uint64_t totalCapacity = 0;
+    // 分配大小
+    uint64_t allocatedSize = 0;
+};
+
 struct SpaceInfo {
     uint64_t totalChunkSize = 0;
     uint64_t usedChunkSize = 0;
@@ -69,6 +80,7 @@ struct SpaceInfo {
     uint64_t recycleAllocSize = 0;
     // 系统中存在的文件大小
     uint64_t currentFileSize = 0;
+    std::unordered_map<uint32_t, LogicalpoolSpaceInfo> lpoolspaceinfo;
 };
 
 enum class ServiceName {