[incubator-uniffle] branch master updated: [#889] improvement: Modify the default value of the `rss.coordinator.select.partition.strategy` parameter to `CONTINUOUS`. (#1036)

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

roryqi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-uniffle.git


The following commit(s) were added to refs/heads/master by this push:
     new 79c95b0c [#889] improvement: Modify the default value of the `rss.coordinator.select.partition.strategy` parameter to `CONTINUOUS`. (#1036)
79c95b0c is described below

commit 79c95b0cf28f65fd5625ddca9b21e5964faba777
Author: Xianming Lei <31...@users.noreply.github.com>
AuthorDate: Wed Jul 26 15:47:21 2023 +0800

    [#889] improvement: Modify the default value of the `rss.coordinator.select.partition.strategy` parameter to `CONTINUOUS`. (#1036)
    
    ### What changes were proposed in this pull request?
    
    Modify the default value of the `rss.coordinator.select.partition.strategy` parameter to `CONTINUOUS`.
    
    ### Why are the changes needed?
    
    For 0.8.0 Release.
    
    ### Does this PR introduce _any_ user-facing change?
    
    No.
    
    ### How was this patch tested?
    
    Exiting UTs.
    
    Co-authored-by: leixianming <le...@didiglobal.com>
---
 conf/coordinator.conf                                                  | 1 +
 .../src/main/java/org/apache/uniffle/coordinator/CoordinatorConf.java  | 2 +-
 .../coordinator/strategy/assignment/BasicAssignmentStrategyTest.java   | 3 +++
 .../strategy/assignment/PartitionBalanceAssignmentStrategyTest.java    | 3 +++
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/conf/coordinator.conf b/conf/coordinator.conf
index 745380df..6e2270ec 100644
--- a/conf/coordinator.conf
+++ b/conf/coordinator.conf
@@ -21,3 +21,4 @@ rss.coordinator.server.heartbeat.timeout 30000
 rss.coordinator.app.expired 60000
 rss.coordinator.shuffle.nodes.max 13
 rss.coordinator.exclude.nodes.file.path file:///xxx
+rss.coordinator.select.partition.strategy CONTINUOUS
diff --git a/coordinator/src/main/java/org/apache/uniffle/coordinator/CoordinatorConf.java b/coordinator/src/main/java/org/apache/uniffle/coordinator/CoordinatorConf.java
index 54639618..8472ae56 100644
--- a/coordinator/src/main/java/org/apache/uniffle/coordinator/CoordinatorConf.java
+++ b/coordinator/src/main/java/org/apache/uniffle/coordinator/CoordinatorConf.java
@@ -196,7 +196,7 @@ public class CoordinatorConf extends RssBaseConf {
       COORDINATOR_SELECT_PARTITION_STRATEGY =
           ConfigOptions.key("rss.coordinator.select.partition.strategy")
               .enumType(AbstractAssignmentStrategy.SelectPartitionStrategyName.class)
-              .defaultValue(AbstractAssignmentStrategy.SelectPartitionStrategyName.ROUND)
+              .defaultValue(AbstractAssignmentStrategy.SelectPartitionStrategyName.CONTINUOUS)
               .withDescription("Strategy for selecting partitions");
   public static final ConfigOption<Integer> COORDINATOR_QUOTA_DEFAULT_APP_NUM =
       ConfigOptions.key("rss.coordinator.quota.default.app.num")
diff --git a/coordinator/src/test/java/org/apache/uniffle/coordinator/strategy/assignment/BasicAssignmentStrategyTest.java b/coordinator/src/test/java/org/apache/uniffle/coordinator/strategy/assignment/BasicAssignmentStrategyTest.java
index 9a6b84ea..95db4cb4 100644
--- a/coordinator/src/test/java/org/apache/uniffle/coordinator/strategy/assignment/BasicAssignmentStrategyTest.java
+++ b/coordinator/src/test/java/org/apache/uniffle/coordinator/strategy/assignment/BasicAssignmentStrategyTest.java
@@ -53,6 +53,9 @@ public class BasicAssignmentStrategyTest {
   @BeforeEach
   public void setUp() throws Exception {
     CoordinatorConf ssc = new CoordinatorConf();
+    ssc.set(
+        CoordinatorConf.COORDINATOR_SELECT_PARTITION_STRATEGY,
+        AbstractAssignmentStrategy.SelectPartitionStrategyName.ROUND);
     ssc.setInteger(CoordinatorConf.COORDINATOR_SHUFFLE_NODES_MAX, shuffleNodesMax);
     clusterManager = new SimpleClusterManager(ssc, new Configuration());
     strategy = new BasicAssignmentStrategy(clusterManager, ssc);
diff --git a/coordinator/src/test/java/org/apache/uniffle/coordinator/strategy/assignment/PartitionBalanceAssignmentStrategyTest.java b/coordinator/src/test/java/org/apache/uniffle/coordinator/strategy/assignment/PartitionBalanceAssignmentStrategyTest.java
index b2b096e4..ad830de7 100644
--- a/coordinator/src/test/java/org/apache/uniffle/coordinator/strategy/assignment/PartitionBalanceAssignmentStrategyTest.java
+++ b/coordinator/src/test/java/org/apache/uniffle/coordinator/strategy/assignment/PartitionBalanceAssignmentStrategyTest.java
@@ -54,6 +54,9 @@ public class PartitionBalanceAssignmentStrategyTest {
   @BeforeEach
   public void setUp() throws Exception {
     CoordinatorConf ssc = new CoordinatorConf();
+    ssc.set(
+        CoordinatorConf.COORDINATOR_SELECT_PARTITION_STRATEGY,
+        AbstractAssignmentStrategy.SelectPartitionStrategyName.ROUND);
     ssc.setInteger(CoordinatorConf.COORDINATOR_SHUFFLE_NODES_MAX, shuffleNodesMax);
     clusterManager = new SimpleClusterManager(ssc, new Configuration());
     strategy = new PartitionBalanceAssignmentStrategy(clusterManager, ssc);