You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uniffle.apache.org by ro...@apache.org on 2023/04/21 10:57:29 UTC
[incubator-uniffle] branch master updated: [MINOR] Remove unused config `SHUFFLE_EXPIRED_TIMEOUT_MS` (#835)
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 3cbc60ee [MINOR] Remove unused config `SHUFFLE_EXPIRED_TIMEOUT_MS` (#835)
3cbc60ee is described below
commit 3cbc60eee233c41da9376515e1c3635dc73bec1d
Author: jokercurry <84...@users.noreply.github.com>
AuthorDate: Fri Apr 21 18:57:23 2023 +0800
[MINOR] Remove unused config `SHUFFLE_EXPIRED_TIMEOUT_MS` (#835)
### What changes were proposed in this pull request?
Remove unused config `SHUFFLE_EXPIRED_TIMEOUT_MS`.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
No need.
---
.../org/apache/uniffle/test/MultiStorageHdfsFallbackTest.java | 1 -
.../apache/uniffle/test/MultiStorageLocalFileFallbackTest.java | 1 -
.../main/java/org/apache/uniffle/server/ShuffleServerConf.java | 8 --------
3 files changed, 10 deletions(-)
diff --git a/integration-test/common/src/test/java/org/apache/uniffle/test/MultiStorageHdfsFallbackTest.java b/integration-test/common/src/test/java/org/apache/uniffle/test/MultiStorageHdfsFallbackTest.java
index 2a6cc1a2..cc7baef8 100644
--- a/integration-test/common/src/test/java/org/apache/uniffle/test/MultiStorageHdfsFallbackTest.java
+++ b/integration-test/common/src/test/java/org/apache/uniffle/test/MultiStorageHdfsFallbackTest.java
@@ -40,7 +40,6 @@ public class MultiStorageHdfsFallbackTest extends MultiStorageFaultToleranceBase
shuffleServerConf.setDouble(ShuffleServerConf.HIGH_WATER_MARK_OF_WRITE, 100.0);
shuffleServerConf.setLong(ShuffleServerConf.DISK_CAPACITY, 1024L * 1024L * 100);
shuffleServerConf.setLong(ShuffleServerConf.PENDING_EVENT_TIMEOUT_SEC, 30L);
- shuffleServerConf.setLong(ShuffleServerConf.SHUFFLE_EXPIRED_TIMEOUT_MS, 5000L);
shuffleServerConf.setLong(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());
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 c3d92934..63b03d9d 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
@@ -43,7 +43,6 @@ public class MultiStorageLocalFileFallbackTest extends MultiStorageFaultToleranc
shuffleServerConf.setDouble(ShuffleServerConf.HIGH_WATER_MARK_OF_WRITE, 100.0);
shuffleServerConf.setLong(ShuffleServerConf.DISK_CAPACITY, 1024L * 1024L * 100);
shuffleServerConf.setLong(ShuffleServerConf.PENDING_EVENT_TIMEOUT_SEC, 30L);
- shuffleServerConf.setLong(ShuffleServerConf.SHUFFLE_EXPIRED_TIMEOUT_MS, 5000L);
shuffleServerConf.setLong(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());
diff --git a/server/src/main/java/org/apache/uniffle/server/ShuffleServerConf.java b/server/src/main/java/org/apache/uniffle/server/ShuffleServerConf.java
index 2f05dc1a..5ee38ad3 100644
--- a/server/src/main/java/org/apache/uniffle/server/ShuffleServerConf.java
+++ b/server/src/main/java/org/apache/uniffle/server/ShuffleServerConf.java
@@ -201,14 +201,6 @@ public class ShuffleServerConf extends RssBaseConf {
.withDescription("The maximum ratio of disk that could be used as shuffle server. This is only effective "
+ "when `rss.server.disk.capacity` is not explicitly set");
- public static final ConfigOption<Long> SHUFFLE_EXPIRED_TIMEOUT_MS = ConfigOptions
- .key("rss.server.shuffle.expired.timeout.ms")
- .longType()
- .checkValue(ConfigUtils.POSITIVE_LONG_VALIDATOR, "shuffle expired timeout must be positive")
- .defaultValue(60L * 1000 * 2)
- .withDescription("If the shuffle is not read for the long time, and shuffle is uploaded totally,"
- + " , we can delete the shuffle");
-
public static final ConfigOption<Long> SERVER_SHUFFLE_INDEX_SIZE_HINT = ConfigOptions
.key("rss.server.index.size.hint")
.longType()