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 2de8a831 [#299] improvement: Make config type of RSS_STORAGE_TYPE as
enum (#1123)
2de8a831 is described below
commit 2de8a831c2d051c341c676286656f56b45d93dcb
Author: Neo Chien <[email protected]>
AuthorDate: Tue Aug 8 23:36:18 2023 +0800
[#299] improvement: Make config type of RSS_STORAGE_TYPE as enum (#1123)
### What changes were proposed in this pull request?
improvement: Make config type of `RSS_STORAGE_TYPE` in `RssBaseConf` as enum
### Why are the changes needed?
Fix: #299 and re-submit for #1106
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
current UT and integration testing
---
.../org/apache/uniffle/common/StorageType.java | 28 ++++++++++++++++++++++
.../apache/uniffle/common/config/RssBaseConf.java | 5 ++--
.../uniffle/test/CoordinatorAssignmentTest.java | 4 ++--
.../uniffle/test/DiskErrorToleranceTest.java | 3 ++-
.../test/HealthCheckCoordinatorGrpcTest.java | 6 +++--
.../org/apache/uniffle/test/HealthCheckTest.java | 4 ++--
.../test/MultiStorageHadoopFallbackTest.java | 2 +-
.../test/MultiStorageLocalFileFallbackTest.java | 2 +-
.../java/org/apache/uniffle/test/ServletTest.java | 2 +-
.../ShuffleServerConcurrentWriteOfHadoopTest.java | 2 +-
.../test/ShuffleServerFaultToleranceTest.java | 7 +++---
.../apache/uniffle/test/ShuffleServerGrpcTest.java | 4 ++--
.../uniffle/test/ShuffleServerWithHadoopTest.java | 2 +-
.../ShuffleServerWithKerberizedHadoopTest.java | 2 +-
.../test/ShuffleServerWithMemLocalHadoopTest.java | 4 ++--
.../uniffle/test/ShuffleServerWithMemoryTest.java | 3 ++-
.../RepartitionWithHadoopMultiStorageRssTest.java | 3 ++-
.../uniffle/test/RepartitionWithMemoryRssTest.java | 3 ++-
...QLWithDelegationShuffleManagerFallbackTest.java | 3 ++-
.../uniffle/server/DefaultFlushEventHandler.java | 3 ++-
.../apache/uniffle/server/LocalStorageChecker.java | 2 +-
.../apache/uniffle/server/ShuffleFlushManager.java | 2 +-
.../org/apache/uniffle/server/ShuffleServer.java | 2 +-
.../uniffle/server/ShuffleServerGrpcService.java | 3 ++-
.../apache/uniffle/server/ShuffleTaskManager.java | 2 +-
.../server/netty/ShuffleServerNettyHandler.java | 3 ++-
.../server/storage/StorageManagerFactory.java | 2 +-
.../ShuffleFlushManagerOnKerberizedHadoopTest.java | 2 +-
.../uniffle/server/ShuffleFlushManagerTest.java | 17 +++++++------
.../uniffle/server/ShuffleServerConfTest.java | 5 ++--
.../uniffle/server/ShuffleServerMetricsTest.java | 3 ++-
.../apache/uniffle/server/ShuffleServerTest.java | 2 +-
.../uniffle/server/ShuffleTaskManagerTest.java | 22 ++++++++---------
.../apache/uniffle/server/StorageCheckerTest.java | 2 +-
.../server/buffer/ShuffleBufferManagerTest.java | 12 +++++-----
.../server/storage/HadoopStorageManagerTest.java | 6 +++--
.../server/storage/LocalStorageManagerTest.java | 13 +++++-----
.../server/storage/MultiStorageManagerTest.java | 9 ++++---
.../StorageManagerFallbackStrategyTest.java | 3 ++-
server/src/test/resources/confTest.conf | 2 +-
40 files changed, 129 insertions(+), 77 deletions(-)
diff --git a/common/src/main/java/org/apache/uniffle/common/StorageType.java
b/common/src/main/java/org/apache/uniffle/common/StorageType.java
new file mode 100644
index 00000000..3473df23
--- /dev/null
+++ b/common/src/main/java/org/apache/uniffle/common/StorageType.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.uniffle.common;
+
+public enum StorageType {
+ MEMORY,
+ LOCALFILE,
+ MEMORY_LOCALFILE,
+ HDFS,
+ MEMORY_HDFS,
+ LOCALFILE_HDFS,
+ MEMORY_LOCALFILE_HDFS;
+}
diff --git
a/common/src/main/java/org/apache/uniffle/common/config/RssBaseConf.java
b/common/src/main/java/org/apache/uniffle/common/config/RssBaseConf.java
index 8f97328e..28d5bf13 100644
--- a/common/src/main/java/org/apache/uniffle/common/config/RssBaseConf.java
+++ b/common/src/main/java/org/apache/uniffle/common/config/RssBaseConf.java
@@ -21,6 +21,7 @@ import java.util.List;
import java.util.Map;
import org.apache.uniffle.common.ClientType;
+import org.apache.uniffle.common.StorageType;
import org.apache.uniffle.common.rpc.ServerType;
import org.apache.uniffle.common.util.RssUtils;
@@ -137,9 +138,9 @@ public class RssBaseConf extends RssConf {
.defaultValue(60 * 1000L)
.withDescription("Remote shuffle service client type grpc timeout
(ms)");
- public static final ConfigOption<String> RSS_STORAGE_TYPE =
+ public static final ConfigOption<StorageType> RSS_STORAGE_TYPE =
ConfigOptions.key("rss.storage.type")
- .stringType()
+ .enumType(StorageType.class)
.noDefaultValue()
.withDescription("Data storage for remote shuffle service");
diff --git
a/integration-test/common/src/test/java/org/apache/uniffle/test/CoordinatorAssignmentTest.java
b/integration-test/common/src/test/java/org/apache/uniffle/test/CoordinatorAssignmentTest.java
index eeb52340..aed654d1 100644
---
a/integration-test/common/src/test/java/org/apache/uniffle/test/CoordinatorAssignmentTest.java
+++
b/integration-test/common/src/test/java/org/apache/uniffle/test/CoordinatorAssignmentTest.java
@@ -79,8 +79,8 @@ public class CoordinatorAssignmentTest extends
CoordinatorTestBase {
ShuffleServerConf shuffleServerConf = getShuffleServerConf();
File dataDir1 = new File(tmpDir, "data1");
String basePath = dataDir1.getAbsolutePath();
- shuffleServerConf.set(
- ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.MEMORY_LOCALFILE_HDFS.name());
+ shuffleServerConf.setString(
+ ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.MEMORY_LOCALFILE_HDFS.name());
shuffleServerConf.set(ShuffleServerConf.RSS_STORAGE_BASE_PATH,
Arrays.asList(basePath));
shuffleServerConf.set(RssBaseConf.RPC_METRICS_ENABLED, true);
shuffleServerConf.set(ShuffleServerConf.SERVER_APP_EXPIRED_WITHOUT_HEARTBEAT,
2000L);
diff --git
a/integration-test/common/src/test/java/org/apache/uniffle/test/DiskErrorToleranceTest.java
b/integration-test/common/src/test/java/org/apache/uniffle/test/DiskErrorToleranceTest.java
index e68ba4c7..70697d51 100644
---
a/integration-test/common/src/test/java/org/apache/uniffle/test/DiskErrorToleranceTest.java
+++
b/integration-test/common/src/test/java/org/apache/uniffle/test/DiskErrorToleranceTest.java
@@ -68,7 +68,8 @@ public class DiskErrorToleranceTest extends
ShuffleReadWriteBase {
CoordinatorConf coordinatorConf = getCoordinatorConf();
createCoordinatorServer(coordinatorConf);
ShuffleServerConf shuffleServerConf = getShuffleServerConf();
- shuffleServerConf.setString(ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.LOCALFILE.name());
+ shuffleServerConf.setString(
+ ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.LOCALFILE.name());
shuffleServerConf.set(
ShuffleServerConf.RSS_STORAGE_BASE_PATH,
Arrays.asList(data1.getAbsolutePath(), data2.getAbsolutePath()));
diff --git
a/integration-test/common/src/test/java/org/apache/uniffle/test/HealthCheckCoordinatorGrpcTest.java
b/integration-test/common/src/test/java/org/apache/uniffle/test/HealthCheckCoordinatorGrpcTest.java
index 705b2ac8..60bad41f 100644
---
a/integration-test/common/src/test/java/org/apache/uniffle/test/HealthCheckCoordinatorGrpcTest.java
+++
b/integration-test/common/src/test/java/org/apache/uniffle/test/HealthCheckCoordinatorGrpcTest.java
@@ -74,7 +74,8 @@ public class HealthCheckCoordinatorGrpcTest extends
CoordinatorTestBase {
createCoordinatorServer(coordinatorConf);
ShuffleServerConf shuffleServerConf = getShuffleServerConf();
shuffleServerConf.setBoolean(ShuffleServerConf.HEALTH_CHECK_ENABLE, true);
- shuffleServerConf.setString(ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.LOCALFILE.name());
+ shuffleServerConf.setString(
+ ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.LOCALFILE.name());
shuffleServerConf.set(
ShuffleServerConf.RSS_STORAGE_BASE_PATH,
Arrays.asList(data1.getAbsolutePath()));
shuffleServerConf.setDouble(
@@ -84,7 +85,8 @@ public class HealthCheckCoordinatorGrpcTest extends
CoordinatorTestBase {
createShuffleServer(shuffleServerConf);
shuffleServerConf.setInteger(ShuffleServerConf.RPC_SERVER_PORT,
SHUFFLE_SERVER_PORT + 1);
shuffleServerConf.setInteger(ShuffleServerConf.JETTY_HTTP_PORT, 18081);
- shuffleServerConf.setString(ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.LOCALFILE.name());
+ shuffleServerConf.setString(
+ ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.LOCALFILE.name());
shuffleServerConf.set(
ShuffleServerConf.RSS_STORAGE_BASE_PATH,
Arrays.asList(data2.getAbsolutePath()));
shuffleServerConf.setDouble(
diff --git
a/integration-test/common/src/test/java/org/apache/uniffle/test/HealthCheckTest.java
b/integration-test/common/src/test/java/org/apache/uniffle/test/HealthCheckTest.java
index e6ee2702..56173cbd 100644
---
a/integration-test/common/src/test/java/org/apache/uniffle/test/HealthCheckTest.java
+++
b/integration-test/common/src/test/java/org/apache/uniffle/test/HealthCheckTest.java
@@ -58,9 +58,9 @@ public class HealthCheckTest extends CoordinatorTestBase {
ShuffleServerConf.HEALTH_CHECKER_CLASS_NAMES.key(),
LocalStorageChecker.class.getCanonicalName());
conf.set(ShuffleServerConf.RSS_STORAGE_BASE_PATH, Arrays.asList("s1"));
- conf.setString(ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.HDFS.name());
+ conf.setString(ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.HDFS.name());
assertConf(conf);
- conf.setString(ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.LOCALFILE.name());
+ conf.setString(ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.LOCALFILE.name());
conf.set(ShuffleServerConf.HEALTH_MIN_STORAGE_PERCENTAGE, -1.0);
assertConf(conf);
conf.set(ShuffleServerConf.HEALTH_MIN_STORAGE_PERCENTAGE, 102.0);
diff --git
a/integration-test/common/src/test/java/org/apache/uniffle/test/MultiStorageHadoopFallbackTest.java
b/integration-test/common/src/test/java/org/apache/uniffle/test/MultiStorageHadoopFallbackTest.java
index 17b2d443..1ea9d192 100644
---
a/integration-test/common/src/test/java/org/apache/uniffle/test/MultiStorageHadoopFallbackTest.java
+++
b/integration-test/common/src/test/java/org/apache/uniffle/test/MultiStorageHadoopFallbackTest.java
@@ -44,7 +44,7 @@ public class MultiStorageHadoopFallbackTest extends
MultiStorageFaultToleranceBa
ShuffleServerConf.SERVER_APP_EXPIRED_WITHOUT_HEARTBEAT, 60L * 1000L *
60L);
shuffleServerConf.setLong(ShuffleServerConf.SERVER_COMMIT_TIMEOUT, 20L *
1000L);
shuffleServerConf.setString(
- ShuffleServerConf.RSS_STORAGE_TYPE, StorageType.LOCALFILE_HDFS.name());
+ ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.LOCALFILE_HDFS.name());
shuffleServerConf.set(ShuffleServerConf.RSS_STORAGE_BASE_PATH,
Arrays.asList(basePath));
shuffleServerConf.setLong(
ShuffleServerConf.FLUSH_COLD_STORAGE_THRESHOLD_SIZE, 1L * 1024L *
1024L);
diff --git
a/integration-test/common/src/test/java/org/apache/uniffle/test/MultiStorageLocalFileFallbackTest.java
b/integration-test/common/src/test/java/org/apache/uniffle/test/MultiStorageLocalFileFallbackTest.java
index d7a1e210..5ed2f3bc 100644
---
a/integration-test/common/src/test/java/org/apache/uniffle/test/MultiStorageLocalFileFallbackTest.java
+++
b/integration-test/common/src/test/java/org/apache/uniffle/test/MultiStorageLocalFileFallbackTest.java
@@ -47,7 +47,7 @@ public class MultiStorageLocalFileFallbackTest extends
MultiStorageFaultToleranc
ShuffleServerConf.SERVER_APP_EXPIRED_WITHOUT_HEARTBEAT, 60L * 1000L *
60L);
shuffleServerConf.setLong(ShuffleServerConf.SERVER_COMMIT_TIMEOUT, 20L *
1000L);
shuffleServerConf.setString(
- ShuffleServerConf.RSS_STORAGE_TYPE, StorageType.LOCALFILE_HDFS.name());
+ ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.LOCALFILE_HDFS.name());
shuffleServerConf.set(ShuffleServerConf.RSS_STORAGE_BASE_PATH,
Arrays.asList(basePath));
shuffleServerConf.setLong(
ShuffleServerConf.FLUSH_COLD_STORAGE_THRESHOLD_SIZE, 1000L * 1024L *
1024L);
diff --git
a/integration-test/common/src/test/java/org/apache/uniffle/test/ServletTest.java
b/integration-test/common/src/test/java/org/apache/uniffle/test/ServletTest.java
index abdd0673..dc6918aa 100644
---
a/integration-test/common/src/test/java/org/apache/uniffle/test/ServletTest.java
+++
b/integration-test/common/src/test/java/org/apache/uniffle/test/ServletTest.java
@@ -85,7 +85,7 @@ public class ServletTest extends IntegrationTestBase {
File dataDir2 = new File(tmpDir, "data2");
List<String> basePath =
Lists.newArrayList(dataDir1.getAbsolutePath(),
dataDir2.getAbsolutePath());
- shuffleServerConf.setString(RssBaseConf.RSS_STORAGE_TYPE,
StorageType.LOCALFILE.name());
+ shuffleServerConf.setString(RssBaseConf.RSS_STORAGE_TYPE.key(),
StorageType.LOCALFILE.name());
shuffleServerConf.set(RssBaseConf.RSS_STORAGE_BASE_PATH, basePath);
createShuffleServer(shuffleServerConf);
File dataDir3 = new File(tmpDir, "data3");
diff --git
a/integration-test/common/src/test/java/org/apache/uniffle/test/ShuffleServerConcurrentWriteOfHadoopTest.java
b/integration-test/common/src/test/java/org/apache/uniffle/test/ShuffleServerConcurrentWriteOfHadoopTest.java
index 09852abf..e46e8744 100644
---
a/integration-test/common/src/test/java/org/apache/uniffle/test/ShuffleServerConcurrentWriteOfHadoopTest.java
+++
b/integration-test/common/src/test/java/org/apache/uniffle/test/ShuffleServerConcurrentWriteOfHadoopTest.java
@@ -65,7 +65,7 @@ public class ShuffleServerConcurrentWriteOfHadoopTest extends
ShuffleServerWithH
CoordinatorConf coordinatorConf = getCoordinatorConf();
createCoordinatorServer(coordinatorConf);
ShuffleServerConf shuffleServerConf = getShuffleServerConf();
- shuffleServerConf.setString(ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.HDFS.name());
+ shuffleServerConf.setString(ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.HDFS.name());
shuffleServerConf.setInteger(
ShuffleServerConf.SERVER_MAX_CONCURRENCY_OF_ONE_PARTITION,
MAX_CONCURRENCY);
shuffleServerConf.setBoolean(shuffleServerConf.SINGLE_BUFFER_FLUSH_ENABLED,
true);
diff --git
a/integration-test/common/src/test/java/org/apache/uniffle/test/ShuffleServerFaultToleranceTest.java
b/integration-test/common/src/test/java/org/apache/uniffle/test/ShuffleServerFaultToleranceTest.java
index 139a6087..85c41090 100644
---
a/integration-test/common/src/test/java/org/apache/uniffle/test/ShuffleServerFaultToleranceTest.java
+++
b/integration-test/common/src/test/java/org/apache/uniffle/test/ShuffleServerFaultToleranceTest.java
@@ -262,7 +262,8 @@ public class ShuffleServerFaultToleranceTest extends
ShuffleReadWriteBase {
public static MockedShuffleServer createServer(int id, File tmpDir) throws
Exception {
ShuffleServerConf shuffleServerConf = getShuffleServerConf();
- shuffleServerConf.set(ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.LOCALFILE.name());
+ shuffleServerConf.setString(
+ ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.LOCALFILE.name());
shuffleServerConf.set(ShuffleServerConf.SERVER_APP_EXPIRED_WITHOUT_HEARTBEAT,
5000L);
shuffleServerConf.set(ShuffleServerConf.SERVER_MEMORY_SHUFFLE_LOWWATERMARK_PERCENTAGE,
20.0);
shuffleServerConf.set(ShuffleServerConf.SERVER_MEMORY_SHUFFLE_HIGHWATERMARK_PERCENTAGE,
40.0);
@@ -273,8 +274,8 @@ public class ShuffleServerFaultToleranceTest extends
ShuffleReadWriteBase {
File dataDir1 = new File(tmpDir, id + "_1");
File dataDir2 = new File(tmpDir, id + "_2");
String basePath = dataDir1.getAbsolutePath() + "," +
dataDir2.getAbsolutePath();
- shuffleServerConf.set(
- ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.MEMORY_LOCALFILE_HDFS.name());
+ shuffleServerConf.setString(
+ ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.MEMORY_LOCALFILE_HDFS.name());
shuffleServerConf.setLong(ShuffleServerConf.FLUSH_COLD_STORAGE_THRESHOLD_SIZE,
450L);
shuffleServerConf.setInteger("rss.rpc.server.port", SHUFFLE_SERVER_PORT +
20 + id);
shuffleServerConf.setInteger("rss.jetty.http.port", 19081 + id * 100);
diff --git
a/integration-test/common/src/test/java/org/apache/uniffle/test/ShuffleServerGrpcTest.java
b/integration-test/common/src/test/java/org/apache/uniffle/test/ShuffleServerGrpcTest.java
index 44bb813e..4fc8a0ea 100644
---
a/integration-test/common/src/test/java/org/apache/uniffle/test/ShuffleServerGrpcTest.java
+++
b/integration-test/common/src/test/java/org/apache/uniffle/test/ShuffleServerGrpcTest.java
@@ -89,8 +89,8 @@ public class ShuffleServerGrpcTest extends
IntegrationTestBase {
ShuffleServerConf shuffleServerConf = getShuffleServerConf();
File dataDir1 = new File(tmpDir, "data1");
String basePath = dataDir1.getAbsolutePath();
- shuffleServerConf.set(
- ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.MEMORY_LOCALFILE_HDFS.name());
+ shuffleServerConf.setString(
+ ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.MEMORY_LOCALFILE_HDFS.name());
shuffleServerConf.set(
ShuffleServerConf.FLUSH_COLD_STORAGE_THRESHOLD_SIZE,
EVENT_THRESHOLD_SIZE);
shuffleServerConf.set(ShuffleServerConf.RSS_STORAGE_BASE_PATH,
Arrays.asList(basePath));
diff --git
a/integration-test/common/src/test/java/org/apache/uniffle/test/ShuffleServerWithHadoopTest.java
b/integration-test/common/src/test/java/org/apache/uniffle/test/ShuffleServerWithHadoopTest.java
index 9c5ad271..4ae09ba1 100644
---
a/integration-test/common/src/test/java/org/apache/uniffle/test/ShuffleServerWithHadoopTest.java
+++
b/integration-test/common/src/test/java/org/apache/uniffle/test/ShuffleServerWithHadoopTest.java
@@ -58,7 +58,7 @@ public class ShuffleServerWithHadoopTest extends
ShuffleReadWriteBase {
CoordinatorConf coordinatorConf = getCoordinatorConf();
createCoordinatorServer(coordinatorConf);
ShuffleServerConf shuffleServerConf = getShuffleServerConf();
- shuffleServerConf.setString(ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.HDFS.name());
+ shuffleServerConf.setString(ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.HDFS.name());
createShuffleServer(shuffleServerConf);
startServers();
}
diff --git
a/integration-test/common/src/test/java/org/apache/uniffle/test/ShuffleServerWithKerberizedHadoopTest.java
b/integration-test/common/src/test/java/org/apache/uniffle/test/ShuffleServerWithKerberizedHadoopTest.java
index e4e90649..8bced501 100644
---
a/integration-test/common/src/test/java/org/apache/uniffle/test/ShuffleServerWithKerberizedHadoopTest.java
+++
b/integration-test/common/src/test/java/org/apache/uniffle/test/ShuffleServerWithKerberizedHadoopTest.java
@@ -100,7 +100,7 @@ public class ShuffleServerWithKerberizedHadoopTest extends
KerberizedHadoopBase
serverConf.setString("rss.server.hadoop.dfs.replication", "2");
serverConf.setLong("rss.server.disk.capacity", 10L * 1024L * 1024L *
1024L);
serverConf.setBoolean("rss.server.health.check.enable", false);
- serverConf.setString(ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.HDFS.name());
+ serverConf.setString(ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.HDFS.name());
serverConf.setBoolean(ShuffleServerConf.RSS_TEST_MODE_ENABLE, true);
return serverConf;
}
diff --git
a/integration-test/common/src/test/java/org/apache/uniffle/test/ShuffleServerWithMemLocalHadoopTest.java
b/integration-test/common/src/test/java/org/apache/uniffle/test/ShuffleServerWithMemLocalHadoopTest.java
index 352d812e..044485b3 100644
---
a/integration-test/common/src/test/java/org/apache/uniffle/test/ShuffleServerWithMemLocalHadoopTest.java
+++
b/integration-test/common/src/test/java/org/apache/uniffle/test/ShuffleServerWithMemLocalHadoopTest.java
@@ -69,8 +69,8 @@ public class ShuffleServerWithMemLocalHadoopTest extends
ShuffleReadWriteBase {
File dataDir = new File(tmpDir, "data");
String basePath = dataDir.getAbsolutePath();
shuffleServerConf.set(ShuffleServerConf.RSS_STORAGE_BASE_PATH,
Arrays.asList(basePath));
- shuffleServerConf.set(
- ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.MEMORY_LOCALFILE_HDFS.name());
+ shuffleServerConf.setString(
+ ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.MEMORY_LOCALFILE_HDFS.name());
shuffleServerConf.setLong(ShuffleServerConf.FLUSH_COLD_STORAGE_THRESHOLD_SIZE,
450L);
shuffleServerConf.set(ShuffleServerConf.SERVER_APP_EXPIRED_WITHOUT_HEARTBEAT,
5000L);
shuffleServerConf.set(ShuffleServerConf.SERVER_MEMORY_SHUFFLE_LOWWATERMARK_PERCENTAGE,
20.0);
diff --git
a/integration-test/common/src/test/java/org/apache/uniffle/test/ShuffleServerWithMemoryTest.java
b/integration-test/common/src/test/java/org/apache/uniffle/test/ShuffleServerWithMemoryTest.java
index 71096c68..80292371 100644
---
a/integration-test/common/src/test/java/org/apache/uniffle/test/ShuffleServerWithMemoryTest.java
+++
b/integration-test/common/src/test/java/org/apache/uniffle/test/ShuffleServerWithMemoryTest.java
@@ -65,7 +65,8 @@ public class ShuffleServerWithMemoryTest extends
ShuffleReadWriteBase {
ShuffleServerConf shuffleServerConf = getShuffleServerConf();
File dataDir = new File(tmpDir, "data");
String basePath = dataDir.getAbsolutePath();
- shuffleServerConf.set(ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.LOCALFILE.name());
+ shuffleServerConf.setString(
+ ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.LOCALFILE.name());
shuffleServerConf.set(ShuffleServerConf.RSS_STORAGE_BASE_PATH,
Arrays.asList(basePath));
shuffleServerConf.set(ShuffleServerConf.SERVER_APP_EXPIRED_WITHOUT_HEARTBEAT,
5000L);
shuffleServerConf.set(ShuffleServerConf.SERVER_MEMORY_SHUFFLE_LOWWATERMARK_PERCENTAGE,
20.0);
diff --git
a/integration-test/spark-common/src/test/java/org/apache/uniffle/test/RepartitionWithHadoopMultiStorageRssTest.java
b/integration-test/spark-common/src/test/java/org/apache/uniffle/test/RepartitionWithHadoopMultiStorageRssTest.java
index d86b0fae..da68543a 100644
---
a/integration-test/spark-common/src/test/java/org/apache/uniffle/test/RepartitionWithHadoopMultiStorageRssTest.java
+++
b/integration-test/spark-common/src/test/java/org/apache/uniffle/test/RepartitionWithHadoopMultiStorageRssTest.java
@@ -61,7 +61,8 @@ public class RepartitionWithHadoopMultiStorageRssTest extends
RepartitionTest {
File dataDir2 = new File(tmpDir, "data2");
String basePath = dataDir1.getAbsolutePath() + "," +
dataDir2.getAbsolutePath();
shuffleServerConf.set(ShuffleServerConf.RSS_STORAGE_BASE_PATH,
Arrays.asList(basePath));
- shuffleServerConf.set(ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.LOCALFILE_HDFS.name());
+ shuffleServerConf.setString(
+ ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.LOCALFILE_HDFS.name());
shuffleServerConf.setLong(ShuffleServerConf.FLUSH_COLD_STORAGE_THRESHOLD_SIZE,
1024L * 1024L);
createShuffleServer(shuffleServerConf);
diff --git
a/integration-test/spark-common/src/test/java/org/apache/uniffle/test/RepartitionWithMemoryRssTest.java
b/integration-test/spark-common/src/test/java/org/apache/uniffle/test/RepartitionWithMemoryRssTest.java
index 70ee6a27..e4169119 100644
---
a/integration-test/spark-common/src/test/java/org/apache/uniffle/test/RepartitionWithMemoryRssTest.java
+++
b/integration-test/spark-common/src/test/java/org/apache/uniffle/test/RepartitionWithMemoryRssTest.java
@@ -48,7 +48,8 @@ public class RepartitionWithMemoryRssTest extends
RepartitionTest {
File dataDir1 = new File(tmpDir, "data1");
File dataDir2 = new File(tmpDir, "data2");
String basePath = dataDir1.getAbsolutePath() + "," +
dataDir2.getAbsolutePath();
- shuffleServerConf.set(ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.MEMORY_LOCALFILE.name());
+ shuffleServerConf.setString(
+ ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.MEMORY_LOCALFILE.name());
shuffleServerConf.set(ShuffleServerConf.RSS_STORAGE_BASE_PATH,
Arrays.asList(basePath));
shuffleServerConf.setString(ShuffleServerConf.SERVER_BUFFER_CAPACITY.key(),
"512mb");
createShuffleServer(shuffleServerConf);
diff --git
a/integration-test/spark-common/src/test/java/org/apache/uniffle/test/SparkSQLWithDelegationShuffleManagerFallbackTest.java
b/integration-test/spark-common/src/test/java/org/apache/uniffle/test/SparkSQLWithDelegationShuffleManagerFallbackTest.java
index fc542735..fd61740b 100644
---
a/integration-test/spark-common/src/test/java/org/apache/uniffle/test/SparkSQLWithDelegationShuffleManagerFallbackTest.java
+++
b/integration-test/spark-common/src/test/java/org/apache/uniffle/test/SparkSQLWithDelegationShuffleManagerFallbackTest.java
@@ -62,7 +62,8 @@ public class SparkSQLWithDelegationShuffleManagerFallbackTest
extends SparkSQLTe
File dataDir1 = new File(tmpDir, "data1");
File dataDir2 = new File(tmpDir, "data2");
String basePath = dataDir1.getAbsolutePath() + "," +
dataDir2.getAbsolutePath();
- shuffleServerConf.set(ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.LOCALFILE.name());
+ shuffleServerConf.setString(
+ ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.LOCALFILE.name());
shuffleServerConf.set(ShuffleServerConf.RSS_STORAGE_BASE_PATH,
Arrays.asList(basePath));
shuffleServerConf.setString(ShuffleServerConf.SERVER_BUFFER_CAPACITY.key(),
"512mb");
createShuffleServer(shuffleServerConf);
diff --git
a/server/src/main/java/org/apache/uniffle/server/DefaultFlushEventHandler.java
b/server/src/main/java/org/apache/uniffle/server/DefaultFlushEventHandler.java
index c3d7aebb..5136caaf 100644
---
a/server/src/main/java/org/apache/uniffle/server/DefaultFlushEventHandler.java
+++
b/server/src/main/java/org/apache/uniffle/server/DefaultFlushEventHandler.java
@@ -55,7 +55,8 @@ public class DefaultFlushEventHandler implements
FlushEventHandler {
StorageManager storageManager,
Consumer<ShuffleDataFlushEvent> eventConsumer) {
this.shuffleServerConf = conf;
- this.storageType =
StorageType.valueOf(shuffleServerConf.get(RssBaseConf.RSS_STORAGE_TYPE));
+ this.storageType =
+
StorageType.valueOf(shuffleServerConf.get(RssBaseConf.RSS_STORAGE_TYPE).name());
this.storageManager = storageManager;
this.eventConsumer = eventConsumer;
initFlushEventExecutor();
diff --git
a/server/src/main/java/org/apache/uniffle/server/LocalStorageChecker.java
b/server/src/main/java/org/apache/uniffle/server/LocalStorageChecker.java
index c4151fa3..8f30663a 100644
--- a/server/src/main/java/org/apache/uniffle/server/LocalStorageChecker.java
+++ b/server/src/main/java/org/apache/uniffle/server/LocalStorageChecker.java
@@ -57,7 +57,7 @@ public class LocalStorageChecker extends Checker {
if (CollectionUtils.isEmpty(basePaths)) {
throw new IllegalArgumentException("The base path cannot be empty");
}
- String storageType = conf.getString(ShuffleServerConf.RSS_STORAGE_TYPE);
+ String storageType = conf.get(ShuffleServerConf.RSS_STORAGE_TYPE).name();
if (!ShuffleStorageUtils.containsLocalFile(storageType)) {
throw new IllegalArgumentException(
"Only StorageType contains LOCALFILE support storageChecker");
diff --git
a/server/src/main/java/org/apache/uniffle/server/ShuffleFlushManager.java
b/server/src/main/java/org/apache/uniffle/server/ShuffleFlushManager.java
index 3335deef..ba46dfab 100644
--- a/server/src/main/java/org/apache/uniffle/server/ShuffleFlushManager.java
+++ b/server/src/main/java/org/apache/uniffle/server/ShuffleFlushManager.java
@@ -70,7 +70,7 @@ public class ShuffleFlushManager {
this.storageManager = storageManager;
initHadoopConf();
retryMax =
shuffleServerConf.getInteger(ShuffleServerConf.SERVER_WRITE_RETRY_MAX);
- storageType = shuffleServerConf.get(RssBaseConf.RSS_STORAGE_TYPE);
+ storageType = shuffleServerConf.get(RssBaseConf.RSS_STORAGE_TYPE).name();
storageDataReplica =
shuffleServerConf.get(RssBaseConf.RSS_STORAGE_DATA_REPLICA);
storageBasePaths = RssUtils.getConfiguredLocalDirs(shuffleServerConf);
diff --git a/server/src/main/java/org/apache/uniffle/server/ShuffleServer.java
b/server/src/main/java/org/apache/uniffle/server/ShuffleServer.java
index 3e953d07..48145884 100644
--- a/server/src/main/java/org/apache/uniffle/server/ShuffleServer.java
+++ b/server/src/main/java/org/apache/uniffle/server/ShuffleServer.java
@@ -192,7 +192,7 @@ public class ShuffleServer {
private void initialization() throws Exception {
boolean testMode = shuffleServerConf.getBoolean(RSS_TEST_MODE_ENABLE);
- String storageType = shuffleServerConf.getString(RSS_STORAGE_TYPE);
+ String storageType = shuffleServerConf.get(RSS_STORAGE_TYPE).name();
if (!testMode
&& (StorageType.LOCALFILE.name().equals(storageType)
|| (StorageType.HDFS.name()).equals(storageType))) {
diff --git
a/server/src/main/java/org/apache/uniffle/server/ShuffleServerGrpcService.java
b/server/src/main/java/org/apache/uniffle/server/ShuffleServerGrpcService.java
index 394293b9..bbaff9f5 100644
---
a/server/src/main/java/org/apache/uniffle/server/ShuffleServerGrpcService.java
+++
b/server/src/main/java/org/apache/uniffle/server/ShuffleServerGrpcService.java
@@ -585,7 +585,8 @@ public class ShuffleServerGrpcService extends
ShuffleServerImplBase {
.recordTransportTime(ShuffleServerGrpcMetrics.GET_SHUFFLE_DATA_METHOD,
transportTime);
}
}
- String storageType =
shuffleServer.getShuffleServerConf().get(RssBaseConf.RSS_STORAGE_TYPE);
+ String storageType =
+
shuffleServer.getShuffleServerConf().get(RssBaseConf.RSS_STORAGE_TYPE).name();
StatusCode status = StatusCode.SUCCESS;
String msg = "OK";
GetLocalShuffleDataResponse reply = null;
diff --git
a/server/src/main/java/org/apache/uniffle/server/ShuffleTaskManager.java
b/server/src/main/java/org/apache/uniffle/server/ShuffleTaskManager.java
index 75b59279..06014738 100644
--- a/server/src/main/java/org/apache/uniffle/server/ShuffleTaskManager.java
+++ b/server/src/main/java/org/apache/uniffle/server/ShuffleTaskManager.java
@@ -557,7 +557,7 @@ public class ShuffleTaskManager {
int partitionNumPerRange,
int partitionNum) {
refreshAppId(appId);
- String storageType = conf.getString(RssBaseConf.RSS_STORAGE_TYPE);
+ String storageType = conf.get(RssBaseConf.RSS_STORAGE_TYPE).name();
CreateShuffleReadHandlerRequest request = new
CreateShuffleReadHandlerRequest();
request.setAppId(appId);
request.setShuffleId(shuffleId);
diff --git
a/server/src/main/java/org/apache/uniffle/server/netty/ShuffleServerNettyHandler.java
b/server/src/main/java/org/apache/uniffle/server/netty/ShuffleServerNettyHandler.java
index c4fb409f..6539fe12 100644
---
a/server/src/main/java/org/apache/uniffle/server/netty/ShuffleServerNettyHandler.java
+++
b/server/src/main/java/org/apache/uniffle/server/netty/ShuffleServerNettyHandler.java
@@ -394,7 +394,8 @@ public class ShuffleServerNettyHandler implements
BaseMessageHandler {
.recordTransportTime(GetLocalShuffleDataRequest.class.getName(),
transportTime);
}
}
- String storageType =
shuffleServer.getShuffleServerConf().get(RssBaseConf.RSS_STORAGE_TYPE);
+ String storageType =
+
shuffleServer.getShuffleServerConf().get(RssBaseConf.RSS_STORAGE_TYPE).name();
StatusCode status = StatusCode.SUCCESS;
String msg = "OK";
GetLocalShuffleDataResponse response;
diff --git
a/server/src/main/java/org/apache/uniffle/server/storage/StorageManagerFactory.java
b/server/src/main/java/org/apache/uniffle/server/storage/StorageManagerFactory.java
index 2990c914..d3800932 100644
---
a/server/src/main/java/org/apache/uniffle/server/storage/StorageManagerFactory.java
+++
b/server/src/main/java/org/apache/uniffle/server/storage/StorageManagerFactory.java
@@ -31,7 +31,7 @@ public class StorageManagerFactory {
}
public StorageManager createStorageManager(ShuffleServerConf conf) {
- StorageType type =
StorageType.valueOf(conf.get(ShuffleServerConf.RSS_STORAGE_TYPE));
+ StorageType type =
StorageType.valueOf(conf.get(ShuffleServerConf.RSS_STORAGE_TYPE).name());
if (StorageType.LOCALFILE.equals(type) ||
StorageType.MEMORY_LOCALFILE.equals(type)) {
return new LocalStorageManager(conf);
} else if (StorageType.HDFS.equals(type) ||
StorageType.MEMORY_HDFS.equals(type)) {
diff --git
a/server/src/test/java/org/apache/uniffle/server/ShuffleFlushManagerOnKerberizedHadoopTest.java
b/server/src/test/java/org/apache/uniffle/server/ShuffleFlushManagerOnKerberizedHadoopTest.java
index 9d8ecd91..ab384142 100644
---
a/server/src/test/java/org/apache/uniffle/server/ShuffleFlushManagerOnKerberizedHadoopTest.java
+++
b/server/src/test/java/org/apache/uniffle/server/ShuffleFlushManagerOnKerberizedHadoopTest.java
@@ -66,7 +66,7 @@ public class ShuffleFlushManagerOnKerberizedHadoopTest
extends KerberizedHadoopB
public void prepare() throws Exception {
ShuffleServerMetrics.register();
shuffleServerConf.set(ShuffleServerConf.RSS_STORAGE_BASE_PATH,
Collections.emptyList());
- shuffleServerConf.setString(ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.HDFS.name());
+ shuffleServerConf.setString(ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.HDFS.name());
shuffleServerConf.setBoolean(ShuffleServerConf.RSS_TEST_MODE_ENABLE, true);
LogManager.getRootLogger().setLevel(Level.INFO);
diff --git
a/server/src/test/java/org/apache/uniffle/server/ShuffleFlushManagerTest.java
b/server/src/test/java/org/apache/uniffle/server/ShuffleFlushManagerTest.java
index 0ebb0d62..2df02033 100644
---
a/server/src/test/java/org/apache/uniffle/server/ShuffleFlushManagerTest.java
+++
b/server/src/test/java/org/apache/uniffle/server/ShuffleFlushManagerTest.java
@@ -101,7 +101,7 @@ public class ShuffleFlushManagerTest extends HadoopTestBase
{
public void prepare() {
ShuffleServerMetrics.register();
shuffleServerConf.set(ShuffleServerConf.RSS_STORAGE_BASE_PATH,
Collections.emptyList());
- shuffleServerConf.setString(ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.HDFS.name());
+ shuffleServerConf.setString(ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.HDFS.name());
shuffleServerConf.setInteger(ShuffleServerConf.SERVER_MAX_CONCURRENCY_OF_ONE_PARTITION,
1);
LogManager.getRootLogger().setLevel(Level.INFO);
}
@@ -131,7 +131,7 @@ public class ShuffleFlushManagerTest extends HadoopTestBase
{
public void concurrentWrite2HdfsWriteOneByOne() throws Exception {
ShuffleServerConf shuffleServerConf = new ShuffleServerConf();
shuffleServerConf.set(ShuffleServerConf.RSS_STORAGE_BASE_PATH,
Collections.emptyList());
- shuffleServerConf.setString(ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.HDFS.name());
+ shuffleServerConf.setString(ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.HDFS.name());
int maxConcurrency = 3;
shuffleServerConf.setInteger(
ShuffleServerConf.SERVER_MAX_CONCURRENCY_OF_ONE_PARTITION,
maxConcurrency);
@@ -163,7 +163,7 @@ public class ShuffleFlushManagerTest extends HadoopTestBase
{
public void concurrentWrite2HdfsWriteOfSinglePartition() throws Exception {
ShuffleServerConf shuffleServerConf = new ShuffleServerConf();
shuffleServerConf.set(ShuffleServerConf.RSS_STORAGE_BASE_PATH,
Collections.emptyList());
- shuffleServerConf.setString(ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.HDFS.name());
+ shuffleServerConf.setString(shuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.HDFS.name());
int maxConcurrency = 3;
shuffleServerConf.setInteger(
ShuffleServerConf.SERVER_MAX_CONCURRENCY_OF_ONE_PARTITION,
maxConcurrency);
@@ -270,7 +270,8 @@ public class ShuffleFlushManagerTest extends HadoopTestBase
{
public void localMetricsTest(@TempDir File tempDir) throws Exception {
shuffleServerConf.set(
ShuffleServerConf.RSS_STORAGE_BASE_PATH,
Arrays.asList(tempDir.getAbsolutePath()));
- shuffleServerConf.set(ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.MEMORY_LOCALFILE.name());
+ shuffleServerConf.setString(
+ ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.MEMORY_LOCALFILE.name());
String appId = "localMetricsTest_appId";
StorageManager storageManager =
@@ -403,7 +404,7 @@ public class ShuffleFlushManagerTest extends HadoopTestBase
{
ShuffleServerConf serverConf = new ShuffleServerConf();
serverConf.set(
ShuffleServerConf.RSS_STORAGE_BASE_PATH,
Arrays.asList(tempDir.getAbsolutePath()));
- serverConf.setString(ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.LOCALFILE.name());
+ serverConf.setString(ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.LOCALFILE.name());
serverConf.setLong(ShuffleServerConf.DISK_CAPACITY, 1024L * 1024L * 1024L);
StorageManager storageManager =
StorageManagerFactory.getInstance().createStorageManager(serverConf);
@@ -575,7 +576,8 @@ public class ShuffleFlushManagerTest extends HadoopTestBase
{
public void fallbackWrittenWhenMultiStorageManagerEnableTest(@TempDir File
tempDir)
throws InterruptedException {
shuffleServerConf.setLong(ShuffleServerConf.FLUSH_COLD_STORAGE_THRESHOLD_SIZE,
10000L);
- shuffleServerConf.set(RssBaseConf.RSS_STORAGE_TYPE,
StorageType.LOCALFILE_HDFS.toString());
+ shuffleServerConf.setString(
+ RssBaseConf.RSS_STORAGE_TYPE.key(),
StorageType.LOCALFILE_HDFS.toString());
shuffleServerConf.set(
RssBaseConf.RSS_STORAGE_BASE_PATH,
Arrays.asList(tempDir.getAbsolutePath()));
shuffleServerConf.set(ShuffleServerConf.DISK_CAPACITY, 100L);
@@ -623,7 +625,8 @@ public class ShuffleFlushManagerTest extends HadoopTestBase
{
@Test
public void defaultFlushEventHandlerTest(@TempDir File tempDir) throws
Exception {
shuffleServerConf.setLong(ShuffleServerConf.FLUSH_COLD_STORAGE_THRESHOLD_SIZE,
10000L);
- shuffleServerConf.set(RssBaseConf.RSS_STORAGE_TYPE,
StorageType.LOCALFILE_HDFS.toString());
+ shuffleServerConf.setString(
+ RssBaseConf.RSS_STORAGE_TYPE.key(),
StorageType.LOCALFILE_HDFS.toString());
shuffleServerConf.set(
RssBaseConf.RSS_STORAGE_BASE_PATH,
Arrays.asList(tempDir.getAbsolutePath()));
shuffleServerConf.set(ShuffleServerConf.DISK_CAPACITY, 100L);
diff --git
a/server/src/test/java/org/apache/uniffle/server/ShuffleServerConfTest.java
b/server/src/test/java/org/apache/uniffle/server/ShuffleServerConfTest.java
index 2674ff30..5a8a7a09 100644
--- a/server/src/test/java/org/apache/uniffle/server/ShuffleServerConfTest.java
+++ b/server/src/test/java/org/apache/uniffle/server/ShuffleServerConfTest.java
@@ -47,7 +47,8 @@ public class ShuffleServerConfTest {
() -> {
ShuffleServerConf shuffleServerConf = new
ShuffleServerConf(null);
assertEquals(1234,
shuffleServerConf.getInteger(ShuffleServerConf.RPC_SERVER_PORT));
- assertEquals("HDFS",
shuffleServerConf.getString(ShuffleServerConf.RSS_STORAGE_TYPE));
+ assertEquals(
+ "HDFS",
shuffleServerConf.get(ShuffleServerConf.RSS_STORAGE_TYPE).name());
assertEquals(
"/var/tmp/test",
shuffleServerConf.get(ShuffleServerConf.RSS_STORAGE_BASE_PATH).get(0));
@@ -60,7 +61,7 @@ public class ShuffleServerConfTest {
public void confTest() {
ShuffleServerConf shuffleServerConf = new ShuffleServerConf(confFile);
assertEquals(1234,
shuffleServerConf.getInteger(ShuffleServerConf.RPC_SERVER_PORT));
- assertEquals("FILE",
shuffleServerConf.getString(ShuffleServerConf.RSS_STORAGE_TYPE));
+ assertEquals("LOCALFILE",
shuffleServerConf.get(ShuffleServerConf.RSS_STORAGE_TYPE).name());
assertEquals(
"/var/tmp/test",
shuffleServerConf.get(ShuffleServerConf.RSS_STORAGE_BASE_PATH).get(0));
assertFalse(shuffleServerConf.loadConfFromFile("/var/tmp/null"));
diff --git
a/server/src/test/java/org/apache/uniffle/server/ShuffleServerMetricsTest.java
b/server/src/test/java/org/apache/uniffle/server/ShuffleServerMetricsTest.java
index d4be783f..f19543bd 100644
---
a/server/src/test/java/org/apache/uniffle/server/ShuffleServerMetricsTest.java
+++
b/server/src/test/java/org/apache/uniffle/server/ShuffleServerMetricsTest.java
@@ -60,7 +60,8 @@ public class ShuffleServerMetricsTest {
ssc.set(ShuffleServerConf.RPC_SERVER_PORT, 12346);
ssc.set(ShuffleServerConf.RSS_STORAGE_BASE_PATH, Arrays.asList("tmp"));
ssc.set(ShuffleServerConf.DISK_CAPACITY, 1024L * 1024L * 1024L);
- ssc.set(ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.MEMORY_LOCALFILE_HDFS.name());
+ ssc.setString(
+ ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.MEMORY_LOCALFILE_HDFS.name());
ssc.set(ShuffleServerConf.RSS_COORDINATOR_QUORUM, "fake.coordinator:123");
ssc.set(ShuffleServerConf.SERVER_BUFFER_CAPACITY, 1000L);
shuffleServer = new ShuffleServer(ssc);
diff --git
a/server/src/test/java/org/apache/uniffle/server/ShuffleServerTest.java
b/server/src/test/java/org/apache/uniffle/server/ShuffleServerTest.java
index 713214a7..767860c5 100644
--- a/server/src/test/java/org/apache/uniffle/server/ShuffleServerTest.java
+++ b/server/src/test/java/org/apache/uniffle/server/ShuffleServerTest.java
@@ -122,7 +122,7 @@ public class ShuffleServerTest {
private ShuffleServerConf createShuffleServerConf() throws Exception {
ShuffleServerConf serverConf = new ShuffleServerConf();
serverConf.setInteger(ShuffleServerConf.RPC_SERVER_PORT, 9527);
- serverConf.setString(ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.LOCALFILE.name());
+ serverConf.setString(ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.LOCALFILE.name());
serverConf.setBoolean(ShuffleServerConf.RSS_TEST_MODE_ENABLE, true);
serverConf.setInteger(ShuffleServerConf.JETTY_HTTP_PORT, 9528);
serverConf.setString(ShuffleServerConf.RSS_COORDINATOR_QUORUM,
"localhost:0");
diff --git
a/server/src/test/java/org/apache/uniffle/server/ShuffleTaskManagerTest.java
b/server/src/test/java/org/apache/uniffle/server/ShuffleTaskManagerTest.java
index 091b473a..3458655d 100644
--- a/server/src/test/java/org/apache/uniffle/server/ShuffleTaskManagerTest.java
+++ b/server/src/test/java/org/apache/uniffle/server/ShuffleTaskManagerTest.java
@@ -98,7 +98,7 @@ public class ShuffleTaskManagerTest extends HadoopTestBase {
public void hugePartitionMemoryUsageLimitTest() throws Exception {
String confFile = ClassLoader.getSystemResource("server.conf").getFile();
ShuffleServerConf conf = new ShuffleServerConf(confFile);
- conf.set(ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.MEMORY_LOCALFILE.name());
+ conf.setString(ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.MEMORY_LOCALFILE.name());
conf.setString(ShuffleServerConf.HUGE_PARTITION_SIZE_THRESHOLD.key(),
"1K");
conf.setString("rss.server.buffer.capacity", "10K");
conf.set(ShuffleServerConf.HUGE_PARTITION_MEMORY_USAGE_LIMITATION_RATIO,
0.1);
@@ -155,7 +155,7 @@ public class ShuffleTaskManagerTest extends HadoopTestBase {
public void partitionDataSizeSummaryTest() throws Exception {
String confFile = ClassLoader.getSystemResource("server.conf").getFile();
ShuffleServerConf conf = new ShuffleServerConf(confFile);
- conf.set(ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.MEMORY_LOCALFILE.name());
+ conf.setString(ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.MEMORY_LOCALFILE.name());
shuffleServer = new ShuffleServer(conf);
ShuffleTaskManager shuffleTaskManager =
shuffleServer.getShuffleTaskManager();
@@ -192,7 +192,7 @@ public class ShuffleTaskManagerTest extends HadoopTestBase {
conf.set(ShuffleServerConf.SERVER_BUFFER_CAPACITY, 128L);
conf.set(ShuffleServerConf.SERVER_MEMORY_SHUFFLE_HIGHWATERMARK_PERCENTAGE,
50.0);
conf.set(ShuffleServerConf.SERVER_MEMORY_SHUFFLE_LOWWATERMARK_PERCENTAGE,
0.0);
- conf.set(ShuffleServerConf.RSS_STORAGE_TYPE, StorageType.HDFS.name());
+ conf.setString(ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.HDFS.name());
conf.set(ShuffleServerConf.RSS_TEST_MODE_ENABLE, true);
conf.set(ShuffleServerConf.SERVER_COMMIT_TIMEOUT, 10000L);
conf.set(ShuffleServerConf.HEALTH_CHECK_ENABLE, false);
@@ -245,7 +245,7 @@ public class ShuffleTaskManagerTest extends HadoopTestBase {
conf.set(ShuffleServerConf.SERVER_BUFFER_CAPACITY, 128L);
conf.set(ShuffleServerConf.SERVER_MEMORY_SHUFFLE_HIGHWATERMARK_PERCENTAGE,
50.0);
conf.set(ShuffleServerConf.SERVER_MEMORY_SHUFFLE_LOWWATERMARK_PERCENTAGE,
0.0);
- conf.set(ShuffleServerConf.RSS_STORAGE_TYPE, StorageType.HDFS.name());
+ conf.setString(ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.HDFS.name());
conf.set(ShuffleServerConf.RSS_TEST_MODE_ENABLE, true);
conf.set(ShuffleServerConf.SERVER_COMMIT_TIMEOUT, 10000L);
conf.set(ShuffleServerConf.SERVER_PRE_ALLOCATION_EXPIRED, 3000L);
@@ -461,7 +461,7 @@ public class ShuffleTaskManagerTest extends HadoopTestBase {
conf.set(ShuffleServerConf.SERVER_APP_EXPIRED_WITHOUT_HEARTBEAT, 100000L);
conf.set(ShuffleServerConf.HEALTH_CHECK_ENABLE, false);
- conf.set(ShuffleServerConf.RSS_STORAGE_TYPE, "LOCALFILE");
+ conf.setString(ShuffleServerConf.RSS_STORAGE_TYPE.key(), "LOCALFILE");
conf.set(ShuffleServerConf.RSS_TEST_MODE_ENABLE, true);
java.nio.file.Path path1 =
Files.createTempDirectory("removeShuffleDataWithLocalfileTest");
java.nio.file.Path path2 =
Files.createTempDirectory("removeShuffleDataWithLocalfileTest");
@@ -518,7 +518,7 @@ public class ShuffleTaskManagerTest extends HadoopTestBase {
conf.set(ShuffleServerConf.SERVER_MEMORY_SHUFFLE_HIGHWATERMARK_PERCENTAGE,
50.0);
conf.set(ShuffleServerConf.SERVER_MEMORY_SHUFFLE_LOWWATERMARK_PERCENTAGE,
0.0);
conf.set(ShuffleServerConf.RSS_STORAGE_BASE_PATH,
Arrays.asList(storageBasePath));
- conf.set(ShuffleServerConf.RSS_STORAGE_TYPE, StorageType.HDFS.name());
+ conf.setString(ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.HDFS.name());
conf.set(ShuffleServerConf.RSS_TEST_MODE_ENABLE, true);
conf.set(ShuffleServerConf.SERVER_COMMIT_TIMEOUT, 10000L);
conf.set(ShuffleServerConf.SERVER_APP_EXPIRED_WITHOUT_HEARTBEAT, 2000L);
@@ -590,7 +590,7 @@ public class ShuffleTaskManagerTest extends HadoopTestBase {
conf.set(ShuffleServerConf.SERVER_MEMORY_SHUFFLE_HIGHWATERMARK_PERCENTAGE,
50.0);
conf.set(ShuffleServerConf.SERVER_MEMORY_SHUFFLE_LOWWATERMARK_PERCENTAGE,
0.0);
conf.set(ShuffleServerConf.RSS_STORAGE_BASE_PATH,
Arrays.asList(storageBasePath));
- conf.set(ShuffleServerConf.RSS_STORAGE_TYPE, StorageType.HDFS.name());
+ conf.setString(ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.HDFS.name());
conf.set(ShuffleServerConf.RSS_TEST_MODE_ENABLE, true);
conf.set(ShuffleServerConf.SERVER_COMMIT_TIMEOUT, 10000L);
conf.set(ShuffleServerConf.SERVER_APP_EXPIRED_WITHOUT_HEARTBEAT, 2000L);
@@ -641,7 +641,7 @@ public class ShuffleTaskManagerTest extends HadoopTestBase {
conf.set(ShuffleServerConf.SERVER_MEMORY_SHUFFLE_HIGHWATERMARK_PERCENTAGE,
50.0);
conf.set(ShuffleServerConf.SERVER_MEMORY_SHUFFLE_LOWWATERMARK_PERCENTAGE,
0.0);
conf.set(ShuffleServerConf.RSS_STORAGE_BASE_PATH,
Arrays.asList(storageBasePath));
- conf.set(ShuffleServerConf.RSS_STORAGE_TYPE, StorageType.HDFS.name());
+ conf.setString(ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.HDFS.name());
conf.set(ShuffleServerConf.RSS_TEST_MODE_ENABLE, true);
conf.set(ShuffleServerConf.SERVER_COMMIT_TIMEOUT, 10000L);
conf.set(ShuffleServerConf.SERVER_APP_EXPIRED_WITHOUT_HEARTBEAT, 2000L);
@@ -778,7 +778,7 @@ public class ShuffleTaskManagerTest extends HadoopTestBase {
conf.set(ShuffleServerConf.SERVER_MEMORY_SHUFFLE_HIGHWATERMARK_PERCENTAGE,
50.0);
conf.set(ShuffleServerConf.SERVER_MEMORY_SHUFFLE_LOWWATERMARK_PERCENTAGE,
0.0);
conf.set(ShuffleServerConf.RSS_STORAGE_BASE_PATH,
Arrays.asList(storageBasePath));
- conf.set(ShuffleServerConf.RSS_STORAGE_TYPE, StorageType.HDFS.name());
+ conf.setString(ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.HDFS.name());
conf.set(ShuffleServerConf.RSS_TEST_MODE_ENABLE, true);
conf.set(ShuffleServerConf.SERVER_COMMIT_TIMEOUT, 10000L);
conf.set(ShuffleServerConf.SERVER_APP_EXPIRED_WITHOUT_HEARTBEAT, 2000L);
@@ -845,7 +845,7 @@ public class ShuffleTaskManagerTest extends HadoopTestBase {
conf.set(ShuffleServerConf.SERVER_MEMORY_SHUFFLE_HIGHWATERMARK_PERCENTAGE,
50.0);
conf.set(ShuffleServerConf.SERVER_MEMORY_SHUFFLE_LOWWATERMARK_PERCENTAGE,
0.0);
conf.set(ShuffleServerConf.RSS_STORAGE_BASE_PATH,
Arrays.asList(storageBasePath));
- conf.set(ShuffleServerConf.RSS_STORAGE_TYPE, StorageType.HDFS.name());
+ conf.setString(ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.HDFS.name());
conf.set(ShuffleServerConf.RSS_TEST_MODE_ENABLE, true);
conf.set(ShuffleServerConf.SERVER_COMMIT_TIMEOUT, 10000L);
conf.set(ShuffleServerConf.SERVER_APP_EXPIRED_WITHOUT_HEARTBEAT, 2000L);
@@ -883,7 +883,7 @@ public class ShuffleTaskManagerTest extends HadoopTestBase {
conf.set(ShuffleServerConf.SERVER_APP_EXPIRED_WITHOUT_HEARTBEAT, 2000L);
conf.set(ShuffleServerConf.HEALTH_CHECK_ENABLE, false);
conf.set(ShuffleServerConf.RSS_STORAGE_BASE_PATH,
Arrays.asList(tempDir.getAbsolutePath()));
- conf.setString(ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.LOCALFILE.name());
+ conf.setString(ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.LOCALFILE.name());
conf.set(ShuffleServerConf.RSS_TEST_MODE_ENABLE, true);
conf.setLong(ShuffleServerConf.DISK_CAPACITY, 1024L * 1024L * 1024L);
// make sure not to check leak shuffle data automatically
diff --git
a/server/src/test/java/org/apache/uniffle/server/StorageCheckerTest.java
b/server/src/test/java/org/apache/uniffle/server/StorageCheckerTest.java
index 71f97ebb..cf543b69 100644
--- a/server/src/test/java/org/apache/uniffle/server/StorageCheckerTest.java
+++ b/server/src/test/java/org/apache/uniffle/server/StorageCheckerTest.java
@@ -55,7 +55,7 @@ public class StorageCheckerTest {
public void checkTest(@TempDir File baseDir) throws Exception {
ShuffleServerConf conf = new ShuffleServerConf();
conf.setBoolean(ShuffleServerConf.HEALTH_CHECK_ENABLE, true);
- conf.setString(ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.LOCALFILE.name());
+ conf.setString(ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.LOCALFILE.name());
String st1 = new File(baseDir, "st1").getPath();
String st2 = new File(baseDir, "st2").getPath();
String st3 = new File(baseDir, "st3").getPath();
diff --git
a/server/src/test/java/org/apache/uniffle/server/buffer/ShuffleBufferManagerTest.java
b/server/src/test/java/org/apache/uniffle/server/buffer/ShuffleBufferManagerTest.java
index 2614624c..5c7bd5eb 100644
---
a/server/src/test/java/org/apache/uniffle/server/buffer/ShuffleBufferManagerTest.java
+++
b/server/src/test/java/org/apache/uniffle/server/buffer/ShuffleBufferManagerTest.java
@@ -74,7 +74,7 @@ public class ShuffleBufferManagerTest extends BufferTestBase {
public void setUp(@TempDir File tmpDir) {
conf = new ShuffleServerConf();
File dataDir = new File(tmpDir, "data");
- conf.setString(ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.LOCALFILE.name());
+ conf.setString(ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.LOCALFILE.name());
conf.set(ShuffleServerConf.RSS_STORAGE_BASE_PATH,
Arrays.asList(dataDir.getAbsolutePath()));
conf.set(ShuffleServerConf.SERVER_BUFFER_CAPACITY, 500L);
conf.set(ShuffleServerConf.SERVER_MEMORY_SHUFFLE_LOWWATERMARK_PERCENTAGE,
20.0);
@@ -439,7 +439,7 @@ public class ShuffleBufferManagerTest extends
BufferTestBase {
public void flushSingleBufferForHugePartitionTest(@TempDir File tmpDir)
throws Exception {
ShuffleServerConf shuffleConf = new ShuffleServerConf();
File dataDir = new File(tmpDir, "data");
- shuffleConf.setString(ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.LOCALFILE.name());
+ shuffleConf.setString(ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.LOCALFILE.name());
shuffleConf.set(
ShuffleServerConf.RSS_STORAGE_BASE_PATH,
Arrays.asList(dataDir.getAbsolutePath()));
shuffleConf.set(ShuffleServerConf.SERVER_MEMORY_SHUFFLE_LOWWATERMARK_PERCENTAGE,
20.0);
@@ -501,7 +501,7 @@ public class ShuffleBufferManagerTest extends
BufferTestBase {
public void flushSingleBufferTest(@TempDir File tmpDir) throws Exception {
ShuffleServerConf shuffleConf = new ShuffleServerConf();
File dataDir = new File(tmpDir, "data");
- shuffleConf.setString(ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.LOCALFILE.name());
+ shuffleConf.setString(ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.LOCALFILE.name());
shuffleConf.set(
ShuffleServerConf.RSS_STORAGE_BASE_PATH,
Arrays.asList(dataDir.getAbsolutePath()));
shuffleConf.set(ShuffleServerConf.SERVER_BUFFER_CAPACITY, 200L);
@@ -652,7 +652,7 @@ public class ShuffleBufferManagerTest extends
BufferTestBase {
// the resources will not leak.
ShuffleServerConf shuffleConf = new ShuffleServerConf();
File dataDir = new File(tmpDir, "data");
- shuffleConf.setString(ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.LOCALFILE.name());
+ shuffleConf.setString(ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.LOCALFILE.name());
shuffleConf.set(
ShuffleServerConf.RSS_STORAGE_BASE_PATH,
Arrays.asList(dataDir.getAbsolutePath()));
shuffleConf.set(ShuffleServerConf.SERVER_BUFFER_CAPACITY, 200L);
@@ -662,8 +662,8 @@ public class ShuffleBufferManagerTest extends
BufferTestBase {
shuffleConf.setBoolean(ShuffleServerConf.SINGLE_BUFFER_FLUSH_ENABLED,
true);
shuffleConf.setSizeAsBytes(ShuffleServerConf.SINGLE_BUFFER_FLUSH_THRESHOLD,
16L);
shuffleConf.setSizeAsBytes(ShuffleServerConf.FLUSH_COLD_STORAGE_THRESHOLD_SIZE,
16L);
- shuffleConf.set(ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.LOCALFILE_HDFS.name());
-
+ shuffleConf.setString(
+ ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.LOCALFILE_HDFS.name());
ShuffleServer mockShuffleServer = mock(ShuffleServer.class);
StorageManager storageManager =
StorageManagerFactory.getInstance().createStorageManager(shuffleConf);
diff --git
a/server/src/test/java/org/apache/uniffle/server/storage/HadoopStorageManagerTest.java
b/server/src/test/java/org/apache/uniffle/server/storage/HadoopStorageManagerTest.java
index c00b88e4..c9fee743 100644
---
a/server/src/test/java/org/apache/uniffle/server/storage/HadoopStorageManagerTest.java
+++
b/server/src/test/java/org/apache/uniffle/server/storage/HadoopStorageManagerTest.java
@@ -54,7 +54,8 @@ public class HadoopStorageManagerTest {
@Test
public void testRemoveResources() {
ShuffleServerConf conf = new ShuffleServerConf();
- conf.setString(ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.MEMORY_LOCALFILE_HDFS.name());
+ conf.setString(
+ ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.MEMORY_LOCALFILE_HDFS.name());
HadoopStorageManager hadoopStorageManager = new HadoopStorageManager(conf);
final String remoteStoragePath1 = "hdfs://path1";
String appId = "testRemoveResources_appId";
@@ -80,7 +81,8 @@ public class HadoopStorageManagerTest {
conf.setLong(ShuffleServerConf.FLUSH_COLD_STORAGE_THRESHOLD_SIZE, 2000L);
conf.set(ShuffleServerConf.RSS_STORAGE_BASE_PATH, Arrays.asList("test"));
conf.setLong(ShuffleServerConf.DISK_CAPACITY, 1024L);
- conf.setString(ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.MEMORY_LOCALFILE_HDFS.name());
+ conf.setString(
+ ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.MEMORY_LOCALFILE_HDFS.name());
HadoopStorageManager hadoopStorageManager = new HadoopStorageManager(conf);
final String remoteStoragePath1 = "hdfs://path1";
final String remoteStoragePath2 = "hdfs://path2";
diff --git
a/server/src/test/java/org/apache/uniffle/server/storage/LocalStorageManagerTest.java
b/server/src/test/java/org/apache/uniffle/server/storage/LocalStorageManagerTest.java
index d5d9cf81..55226586 100644
---
a/server/src/test/java/org/apache/uniffle/server/storage/LocalStorageManagerTest.java
+++
b/server/src/test/java/org/apache/uniffle/server/storage/LocalStorageManagerTest.java
@@ -88,7 +88,7 @@ public class LocalStorageManagerTest {
conf.set(ShuffleServerConf.RSS_STORAGE_BASE_PATH,
Arrays.asList(storagePaths));
conf.setLong(ShuffleServerConf.DISK_CAPACITY, 1024L);
conf.setString(
- ShuffleServerConf.RSS_STORAGE_TYPE,
+ ShuffleServerConf.RSS_STORAGE_TYPE.key(),
org.apache.uniffle.storage.util.StorageType.LOCALFILE.name());
LocalStorageManager localStorageManager = new LocalStorageManager(conf);
@@ -112,7 +112,7 @@ public class LocalStorageManagerTest {
conf.set(ShuffleServerConf.RSS_STORAGE_BASE_PATH,
Arrays.asList(storagePaths));
conf.setLong(ShuffleServerConf.DISK_CAPACITY, 1024L);
conf.setString(
- ShuffleServerConf.RSS_STORAGE_TYPE,
+ ShuffleServerConf.RSS_STORAGE_TYPE.key(),
org.apache.uniffle.storage.util.StorageType.LOCALFILE.name());
LocalStorageManager localStorageManager = new LocalStorageManager(conf);
@@ -177,7 +177,7 @@ public class LocalStorageManagerTest {
conf.set(ShuffleServerConf.RSS_STORAGE_BASE_PATH,
Arrays.asList(storagePaths));
conf.setLong(ShuffleServerConf.DISK_CAPACITY, 1024L);
conf.setString(
- ShuffleServerConf.RSS_STORAGE_TYPE,
+ ShuffleServerConf.RSS_STORAGE_TYPE.key(),
org.apache.uniffle.storage.util.StorageType.LOCALFILE.name());
LocalStorageManager localStorageManager = new LocalStorageManager(conf);
@@ -198,7 +198,8 @@ public class LocalStorageManagerTest {
conf.set(ShuffleServerConf.RSS_STORAGE_BASE_PATH,
Arrays.asList("/a/rss-data", "/b/rss-data"));
conf.setLong(ShuffleServerConf.DISK_CAPACITY, 1024L);
conf.setLong(ShuffleServerConf.LOCAL_STORAGE_INITIALIZE_MAX_FAIL_NUMBER,
1);
- conf.setString(ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.MEMORY_LOCALFILE_HDFS.name());
+ conf.setString(
+ ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.MEMORY_LOCALFILE_HDFS.name());
try {
LocalStorageManager localStorageManager = new LocalStorageManager(conf);
fail();
@@ -252,7 +253,7 @@ public class LocalStorageManagerTest {
conf.set(ShuffleServerConf.RSS_STORAGE_BASE_PATH,
Arrays.asList(storagePaths));
conf.setLong(ShuffleServerConf.DISK_CAPACITY, 1024L);
conf.setString(
- ShuffleServerConf.RSS_STORAGE_TYPE,
+ ShuffleServerConf.RSS_STORAGE_TYPE.key(),
org.apache.uniffle.storage.util.StorageType.LOCALFILE.name());
LocalStorageManager localStorageManager = new LocalStorageManager(conf);
Map<String, StorageInfo> storageInfo =
localStorageManager.getStorageInfo();
@@ -292,7 +293,7 @@ public class LocalStorageManagerTest {
conf.set(ShuffleServerConf.RSS_STORAGE_BASE_PATH,
Arrays.asList(storagePaths));
conf.setLong(ShuffleServerConf.DISK_CAPACITY, 1024L);
conf.setString(
- ShuffleServerConf.RSS_STORAGE_TYPE,
+ ShuffleServerConf.RSS_STORAGE_TYPE.key(),
org.apache.uniffle.storage.util.StorageType.LOCALFILE.name());
conf.set(ShuffleServerConf.STORAGE_MEDIA_PROVIDER_ENV_KEY, "env_key");
withEnvironmentVariables("env_key", "{\"/tmp\": \"ssd\"}")
diff --git
a/server/src/test/java/org/apache/uniffle/server/storage/MultiStorageManagerTest.java
b/server/src/test/java/org/apache/uniffle/server/storage/MultiStorageManagerTest.java
index b5cb1894..089e3f61 100644
---
a/server/src/test/java/org/apache/uniffle/server/storage/MultiStorageManagerTest.java
+++
b/server/src/test/java/org/apache/uniffle/server/storage/MultiStorageManagerTest.java
@@ -42,7 +42,8 @@ public class MultiStorageManagerTest {
conf.setLong(ShuffleServerConf.FLUSH_COLD_STORAGE_THRESHOLD_SIZE, 2000L);
conf.set(ShuffleServerConf.RSS_STORAGE_BASE_PATH, Arrays.asList("test"));
conf.setLong(ShuffleServerConf.DISK_CAPACITY, 1024L * 1024L * 1024L);
- conf.setString(ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.MEMORY_LOCALFILE_HDFS.name());
+ conf.setString(
+ ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.MEMORY_LOCALFILE_HDFS.name());
MultiStorageManager manager = new MultiStorageManager(conf);
String remoteStorage = "test";
String appId = "selectStorageManagerTest_appId";
@@ -62,7 +63,8 @@ public class MultiStorageManagerTest {
conf.setLong(ShuffleServerConf.FLUSH_COLD_STORAGE_THRESHOLD_SIZE, 10000L);
conf.set(ShuffleServerConf.RSS_STORAGE_BASE_PATH, Arrays.asList("test"));
conf.setLong(ShuffleServerConf.DISK_CAPACITY, 10000L);
- conf.setString(ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.MEMORY_LOCALFILE_HDFS.name());
+ conf.setString(
+ ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.MEMORY_LOCALFILE_HDFS.name());
conf.setString(
ShuffleServerConf.MULTISTORAGE_FALLBACK_STRATEGY_CLASS,
RotateStorageManagerFallbackStrategy.class.getCanonicalName());
@@ -99,7 +101,8 @@ public class MultiStorageManagerTest {
conf.setLong(ShuffleServerConf.FLUSH_COLD_STORAGE_THRESHOLD_SIZE, 10000L);
conf.set(ShuffleServerConf.RSS_STORAGE_BASE_PATH, Arrays.asList("test"));
conf.setLong(ShuffleServerConf.DISK_CAPACITY, 10000L);
- conf.setString(ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.MEMORY_LOCALFILE_HDFS.name());
+ conf.setString(
+ ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.MEMORY_LOCALFILE_HDFS.name());
conf.setString(
ShuffleServerConf.MULTISTORAGE_FALLBACK_STRATEGY_CLASS,
RotateStorageManagerFallbackStrategy.class.getCanonicalName());
diff --git
a/server/src/test/java/org/apache/uniffle/server/storage/StorageManagerFallbackStrategyTest.java
b/server/src/test/java/org/apache/uniffle/server/storage/StorageManagerFallbackStrategyTest.java
index e9a5056d..a7598c4f 100644
---
a/server/src/test/java/org/apache/uniffle/server/storage/StorageManagerFallbackStrategyTest.java
+++
b/server/src/test/java/org/apache/uniffle/server/storage/StorageManagerFallbackStrategyTest.java
@@ -41,7 +41,8 @@ public class StorageManagerFallbackStrategyTest {
conf.setLong(ShuffleServerConf.FLUSH_COLD_STORAGE_THRESHOLD_SIZE, 10000L);
conf.set(ShuffleServerConf.RSS_STORAGE_BASE_PATH, Arrays.asList("test"));
conf.setLong(ShuffleServerConf.DISK_CAPACITY, 10000L);
- conf.setString(ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.MEMORY_LOCALFILE_HDFS.name());
+ conf.setString(
+ ShuffleServerConf.RSS_STORAGE_TYPE.key(),
StorageType.MEMORY_LOCALFILE_HDFS.name());
}
@Test
diff --git a/server/src/test/resources/confTest.conf
b/server/src/test/resources/confTest.conf
index 6007fb90..21f705dc 100644
--- a/server/src/test/resources/confTest.conf
+++ b/server/src/test/resources/confTest.conf
@@ -16,7 +16,7 @@
#
rss.rpc.server.port 1234
-rss.storage.type FILE
+rss.storage.type LOCALFILE
rss.storage.basePath /var/tmp/test
rss.server.coordinator.ip localhost
rss.server.coordinator.port 9527
