mds:add conf allocateSegmentStrategy

opencurve · Nov 23, 2023 · ee0b0bb · ee0b0bb
1 parent 2fc6702
commit ee0b0bb
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 6 deletions.
diff --git a/conf/mds.conf b/conf/mds.conf
@@ -147,6 +147,8 @@ mds.topology.PoolUsagePercentLimit=85
 mds.topology.choosePoolPolicy=0
 # enable LogicalPool ALLOW/DENY status
 mds.topology.enableLogicalPoolStatus=false
+# allocate segment by 0:logicalpool/1:pyhsicalpool/2:both
+mds.topology.allocateSegmentStrategy=1
 
 #
 # copyset config

diff --git a/src/mds/server/mds.cpp b/src/mds/server/mds.cpp
@@ -338,6 +338,9 @@ void MDS::InitTopologyOption(TopologyOption *topologyOption) {
     conf_->GetValueFatalIfFail(
         "mds.topology.enableLogicalPoolStatus",
         &topologyOption->enableLogicalPoolStatus);
+    conf_->GetValueFatalIfFail(
+        "mds.topology.allocateSegmentStrategy",
+        &topologyOption->allocateSegmentStrategy);
 }
 
 void MDS::InitTopology(const TopologyOption& option) {

diff --git a/src/mds/topology/topology_chunk_allocator.cpp b/src/mds/topology/topology_chunk_allocator.cpp
@@ -251,10 +251,25 @@ void TopologyChunkAllocatorImpl::GetRemainingSpaceInLogicalPool(
                   << ", isSomeCSFull: " << isSomeCSFull
                   << "}";
 
-        if ((diskRemianning > 0) &&
-            (allocRemainning > 0) &&
-            !isSomeCSFull) {
-            (*enoughSpacePools)[pid] = diskRemianning;
+        switch (allocateSegmentStrategy_) {
+            case AllocateSegmentStrategy::kLogicalPool:
+                if (allocRemainning > 0) {
+                    (*enoughSpacePools)[pid] = allocRemainning;
+                }
+                break;
+            case AllocateSegmentStrategy::kPhysicalPool:
+                if ((diskRemianning > 0) &&
+                    !isSomeCSFull) {
+                    (*enoughSpacePools)[pid] = diskRemianning;
+                }
+                break;
+            default:
+                if ((diskRemianning > 0) &&
+                    (allocRemainning > 0) &&
+                    !isSomeCSFull) {
+                    (*enoughSpacePools)[pid] = diskRemianning;
+                }
+                break;
         }
     }
 }

diff --git a/src/mds/topology/topology_chunk_allocator.h b/src/mds/topology/topology_chunk_allocator.h
@@ -48,6 +48,12 @@ enum class ChoosePoolPolicy {
     kWeight,
 };
 
+enum class AllocateSegmentStrategy {
+    kLogicalPool = 0,
+    kPhysicalPool,
+    kBoth,
+};
+
 class TopologyChunkAllocator {
  public:
     TopologyChunkAllocator() {}
@@ -85,7 +91,10 @@ class TopologyChunkAllocatorImpl : public TopologyChunkAllocator {
         chunkFilePoolAllocHelp_(chunkFilePoolAllocHelp),
         available_(option.PoolUsagePercentLimit),
         policy_(static_cast<ChoosePoolPolicy>(option.choosePoolPolicy)),
-        enableLogicalPoolStatus_(option.enableLogicalPoolStatus) {
+        enableLogicalPoolStatus_(option.enableLogicalPoolStatus),
+        allocateSegmentStrategy_(
+            static_cast<AllocateSegmentStrategy>(
+                option.allocateSegmentStrategy)) {
         std::srand(std::time(nullptr));
     }
     ~TopologyChunkAllocatorImpl() {}
@@ -180,6 +189,8 @@ class TopologyChunkAllocatorImpl : public TopologyChunkAllocator {
     ChoosePoolPolicy policy_;
     // enableLogicalPoolStatus
     bool enableLogicalPoolStatus_;
+    // allocate segment stragegy
+    AllocateSegmentStrategy allocateSegmentStrategy_;
 };
 
 /**

diff --git a/src/mds/topology/topology_config.h b/src/mds/topology/topology_config.h
@@ -46,6 +46,8 @@ struct TopologyOption {
     int choosePoolPolicy;
     // enable LogicalPool ALLOW/DENY status
     bool enableLogicalPoolStatus;
+    // allocate segment by 0:logicalpool/1:pyhsicalpool/2:both
+    int allocateSegmentStrategy;
 
     TopologyOption()
         : TopologyUpdateToRepoSec(0),
@@ -54,7 +56,8 @@ struct TopologyOption {
           CreateCopysetRpcRetrySleepTimeMs(500),
           UpdateMetricIntervalSec(0),
           choosePoolPolicy(0),
-          enableLogicalPoolStatus(false) {}
+          enableLogicalPoolStatus(false),
+          allocateSegmentStrategy(2) {}
 };
 
 }  // namespace topology