This is an automated email from the ASF dual-hosted git repository.
zuston 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 0479ca705 [#1191][FOLLOWUP] improvement(conf): use the unified name
for hybrid storage in conf (#1350)
0479ca705 is described below
commit 0479ca705be3c5f9dc09550e1f7de94246074f1a
Author: Junfan Zhang <[email protected]>
AuthorDate: Wed Dec 6 13:14:21 2023 +0800
[#1191][FOLLOWUP] improvement(conf): use the unified name for hybrid
storage in conf (#1350)
### What changes were proposed in this pull request?
use the unified name for hybrid storage in conf
### Why are the changes needed?
Fix: #1191
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Needn't
---
docs/server_guide.md | 2 +-
.../org/apache/uniffle/server/ShuffleServerConf.java | 16 +++++++++-------
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/docs/server_guide.md b/docs/server_guide.md
index 68c97bc2d..0e70dab72 100644
--- a/docs/server_guide.md
+++ b/docs/server_guide.md
@@ -99,7 +99,7 @@ This document will introduce how to deploy Uniffle shuffle
servers.
| rss.server.max.concurrency.of.per-partition.write | 30
| The max concurrency of
single partition writer, the data partition file number is equal to this value.
Default value is 1. This config could improve the writing speed, especially for
huge partition.
[...]
| rss.server.max.concurrency.limit.of.per-partition.write | -
| The limit for max
concurrency per-partition write specified by client, this won't be enabled by
default.
[...]
| rss.metrics.reporter.class | -
| The class of metrics
reporter.
[...]
-| rss.server.hyrbrid.storage.manager.selector.class |
org.apache.uniffle.server.storage.hybrid.DefaultStorageManagerSelector | The
manager selector strategy for `MEMORY_LOCALFILE_HDFS`. Default value is
`DefaultStorageManagerSelector`, and another
`HugePartitionSensitiveStorageManagerSelector` will flush only huge partition's
data to cold storage.
[...]
+| rss.server.hybrid.storage.manager.selector.class |
org.apache.uniffle.server.storage.hybrid.DefaultStorageManagerSelector | The
manager selector strategy for `MEMORY_LOCALFILE_HDFS`. Default value is
`DefaultStorageManagerSelector`, and another
`HugePartitionSensitiveStorageManagerSelector` will flush only huge partition's
data to cold storage.
[...]
| rss.server.disk-capacity.watermark.check.enabled | false
| If it is co-located with
other services, the high-low watermark check based on the uniffle used is not
correct. Due to this, the whole disk capacity watermark check is necessary,
which will reuse the current watermark value. It will be disabled by default.
[...]
### Advanced Configurations
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 fe45c2360..802455a42 100644
--- a/server/src/main/java/org/apache/uniffle/server/ShuffleServerConf.java
+++ b/server/src/main/java/org/apache/uniffle/server/ShuffleServerConf.java
@@ -319,14 +319,14 @@ public class ShuffleServerConf extends RssBaseConf {
ConfigUtils.POSITIVE_LONG_VALIDATOR, "flush cold storage
threshold must be positive")
.defaultValue(64L * 1024L * 1024L)
.withDescription(
- "For multistorage, the event size exceed this value, flush data
to cold storage");
+ "For hybrid storage, the event size exceed this value, flush
data to cold storage");
public static final ConfigOption<String>
HYBRID_STORAGE_MANAGER_SELECTOR_CLASS =
ConfigOptions.key("rss.server.hybrid.storage.manager.selector.class")
.stringType()
.defaultValue("org.apache.uniffle.server.storage.hybrid.DefaultStorageManagerSelector")
.withDescription(
- "For multistorage, the storage manager selector strategy to
support "
+ "For hybrid storage, the storage manager selector strategy to
support "
+ "policies of flushing to different storages")
.withDeprecatedKeys("rss.server.multistorage.manager.selector.class");
@@ -334,16 +334,17 @@ public class ShuffleServerConf extends RssBaseConf {
ConfigOptions.key("rss.server.hybrid.storage.fallback.strategy.class")
.stringType()
.noDefaultValue()
- .withDescription("For multistorage, fallback strategy class")
+ .withDescription("For hybrid storage, fallback strategy class")
.withDeprecatedKeys("rss.server.multistorage.fallback.strategy.class");
public static final ConfigOption<Long> FALLBACK_MAX_FAIL_TIMES =
- ConfigOptions.key("rss.server.multistorage.fallback.max.fail.times")
+ ConfigOptions.key("rss.server.hybrid.storage.fallback.max.fail.times")
.longType()
.checkValue(
ConfigUtils.NON_NEGATIVE_LONG_VALIDATOR, " fallback times must
be non-negative")
.defaultValue(0L)
- .withDescription("For multistorage, fail times exceed the number,
will switch storage");
+ .withDescription("For hybrid storage, fail times exceed the number,
will switch storage")
+
.withDeprecatedKeys("rss.server.multistorage.fallback.max.fail.times");
public static final ConfigOption<List<String>> TAGS =
ConfigOptions.key("rss.server.tags")
@@ -375,10 +376,11 @@ public class ShuffleServerConf extends RssBaseConf {
.withDescription("The threshold of single shuffle buffer flush");
public static final ConfigOption<Long> STORAGEMANAGER_CACHE_TIMEOUT =
- ConfigOptions.key("rss.server.multistorage.storagemanager.cache.timeout")
+
ConfigOptions.key("rss.server.hybrid.storage.storagemanager.cache.timeout")
.longType()
.defaultValue(60 * 1000L)
- .withDescription("The timeout of the cache which record the mapping
information");
+ .withDescription("The timeout of the cache which record the mapping
information")
+
.withDeprecatedKeys("rss.server.multistorage.storagemanager.cache.timeout");
public static final ConfigOption<Long>
SERVER_LEAK_SHUFFLE_DATA_CHECK_INTERVAL =
ConfigOptions.key("rss.server.leak.shuffledata.check.interval")
