zhengchenyu commented on code in PR #1413:
URL:
https://github.com/apache/incubator-uniffle/pull/1413#discussion_r1448448190
##########
client-tez/src/test/java/org/apache/tez/dag/app/TezRemoteShuffleManagerTest.java:
##########
@@ -224,7 +227,12 @@ public void testTezRemoteShuffleManagerSecure() {
secretManager.addTokenForJob(tokenIdentifier, sessionToken);
TezRemoteShuffleManager tezRemoteShuffleManager =
new TezRemoteShuffleManager(
- appId.toString(), sessionToken, conf, appId.toString(), client,
null);
+ appId.toString(),
+ sessionToken,
+ new TezClientConf(conf),
Review Comment:
I means that new TezClientConf() without any parameter, then set
TEZ_RSS_TEST_MODE_ENABLE.
Then TezClientConf without any parameter will be zero cost.
Here we must load configuration, I think it is not neccessary. Because the
configuration in TezClientConf(new Configuration) doesn't pass any useful
config.
##########
client-tez/src/main/java/org/apache/tez/common/TezClientConf.java:
##########
@@ -0,0 +1,395 @@
+/*
+ * 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.tez.common;
+
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+
+import com.google.common.collect.ImmutableSet;
+import org.apache.hadoop.conf.Configuration;
+
+import org.apache.uniffle.common.config.ConfigOption;
+import org.apache.uniffle.common.config.ConfigOptions;
+import org.apache.uniffle.common.config.ConfigUtils;
+import org.apache.uniffle.common.config.RssBaseConf;
+import org.apache.uniffle.common.config.RssConf;
+
+public class TezClientConf extends RssBaseConf {
+ public static final String TEZ_RSS_CONFIG_PREFIX = "tez.";
+
+ public static final ConfigOption<Integer> RSS_CLIENT_HEARTBEAT_THREAD_NUM =
+ ConfigOptions.key("tez.rss.client.heartBeat.threadNum")
+ .intType()
+ .defaultValue(4)
+ .withDescription("");
+
+ public static final ConfigOption<String> RSS_CLIENT_TYPE =
+ ConfigOptions.key("tez.rss.client.type")
+ .stringType()
+ .defaultValue("GRPC")
+ .withDescription("RSS Client type, maybe GRPC");
+
+ public static final ConfigOption<Integer> RSS_CLIENT_RETRY_MAX =
+
ConfigOptions.key("tez.rss.client.retry.max").intType().defaultValue(50).withDescription("");
+
+ public static final ConfigOption<Long> RSS_CLIENT_RETRY_INTERVAL_MAX =
+ ConfigOptions.key("tez.rss.client.retry.interval.max")
+ .longType()
+ .defaultValue(10000L)
+ .withDescription("");
+
+ public static final ConfigOption<String> RSS_COORDINATOR_QUORUM =
+ ConfigOptions.key("tez.rss.coordinator.quorum")
+ .stringType()
+ .defaultValue("")
+ .withDescription("");
+
+ public static final ConfigOption<Integer> RSS_DATA_REPLICA =
+
ConfigOptions.key("tez.rss.data.replica").intType().defaultValue(1).withDescription("");
+
+ public static final ConfigOption<Integer> RSS_DATA_REPLICA_WRITE =
+
ConfigOptions.key("tez.rss.data.replica.write").intType().defaultValue(1).withDescription("");
+
+ public static final ConfigOption<Integer> RSS_DATA_REPLICA_READ =
+
ConfigOptions.key("tez.rss.data.replica.read").intType().defaultValue(1).withDescription("");
+
+ public static final ConfigOption<Boolean> RSS_DATA_REPLICA_SKIP_ENABLED =
+ ConfigOptions.key("tez.rss.data.replica.skip.enabled")
+ .booleanType()
+ .defaultValue(true)
+ .withDescription("");
+
+ public static final ConfigOption<Integer> RSS_DATA_TRANSFER_POOL_SIZE =
+ ConfigOptions.key("tez.rss.client.data.transfer.pool.size")
+ .intType()
+ .defaultValue(Runtime.getRuntime().availableProcessors())
+ .withDescription("");
+
+ public static final ConfigOption<Integer> RSS_DATA_COMMIT_POOL_SIZE =
+ ConfigOptions.key("tez.rss.client.data.commit.pool.size")
+ .intType()
+ .defaultValue(-1)
+ .withDescription("");
+
+ public static final ConfigOption<Long> RSS_HEARTBEAT_INTERVAL =
+ ConfigOptions.key("tez.rss.heartbeat.interval")
+ .longType()
+ .defaultValue(10 * 1000L)
+ .withDescription("");
+
+ public static final ConfigOption<Long> RSS_HEARTBEAT_TIMEOUT =
+ ConfigOptions.key("tez.rss.heartbeat.timeout")
+ .longType()
+ .defaultValue(5 * 1000L)
+ .withDescription("");
+
+ public static final ConfigOption<Integer> RSS_RUNTIME_IO_SORT_MB =
+ ConfigOptions.key("tez.rss.runtime.io.sort.mb")
+ .intType()
+ .defaultValue(100)
+ .withDescription("");
+
+ public static final ConfigOption<Double>
RSS_CLIENT_SORT_MEMORY_USE_THRESHOLD =
+ ConfigOptions.key("tez.rss.client.sort.memory.use.threshold")
+ .doubleType()
+ .defaultValue(0.9)
+ .withDescription("");
+
+ public static final ConfigOption<Integer> RSS_CLIENT_MAX_BUFFER_SIZE =
+ ConfigOptions.key("tez.rss.client.max.buffer.size")
+ .intType()
+ .defaultValue(3 * 1024)
+ .withDescription("");
+
+ public static final ConfigOption<Long> RSS_WRITER_BUFFER_SIZE =
+ ConfigOptions.key("tez.rss.writer.buffer.size")
+ .longType()
+ .defaultValue(1024 * 1024 * 14L)
+ .withDescription("");
+
+ public static final ConfigOption<Float> RSS_CLIENT_MEMORY_THRESHOLD =
+ ConfigOptions.key("tez.rss.client.memory.threshold")
+ .floatType()
+ .defaultValue(0.8f)
+ .withDescription("");
+
+ public static final ConfigOption<Integer> RSS_CLIENT_SEND_THREAD_NUM =
+ ConfigOptions.key("tez.rss.client.send.thread.num")
+ .intType()
+ .defaultValue(5)
+ .withDescription("");
+
+ public static final ConfigOption<Double> RSS_CLIENT_SEND_THRESHOLD =
+ ConfigOptions.key("tez.rss.client.send.threshold")
+ .doubleType()
+ .defaultValue(0.2)
+ .withDescription("");
+
+ public static final ConfigOption<Integer> RSS_CLIENT_BATCH_TRIGGER_NUM =
+ ConfigOptions.key("tez.rss.client.batch.trigger.num")
+ .intType()
+ .defaultValue(50)
+ .withDescription("");
+
+ public static final ConfigOption<Long> RSS_CLIENT_SEND_CHECK_INTERVAL_MS =
+ ConfigOptions.key("tez.rss.client.send.check.interval.ms")
+ .longType()
+ .defaultValue(500L)
+ .withDescription("");
+
+ public static final ConfigOption<Long> RSS_CLIENT_SEND_CHECK_TIMEOUT_MS =
+ ConfigOptions.key("tez.rss.client.send.check.timeout.ms")
+ .longType()
+ .defaultValue(60 * 1000 * 10L)
+ .withDescription("");
+
+ public static final ConfigOption<Integer> RSS_CLIENT_BITMAP_NUM =
+
ConfigOptions.key("tez.rss.client.bitmap.num").intType().defaultValue(1).withDescription("");
+
+ public static final ConfigOption<String> RSS_STORAGE_TYPE =
+ ConfigOptions.key("tez.rss.storage.type")
+ .stringType()
+ .defaultValue("MEMORY_LOCALFILE")
+ .withDescription("");
+
+ public static final ConfigOption<Boolean> RSS_DYNAMIC_CLIENT_CONF_ENABLED =
+ ConfigOptions.key("tez.rss.dynamicClientConf.enabled")
+ .booleanType()
+ .defaultValue(true)
+ .withDescription("");
+
+ public static final ConfigOption<Boolean> RSS_AM_SLOW_START_ENABLE =
+ ConfigOptions.key("tez.rss.am.slow.start.enable")
+ .booleanType()
+ .defaultValue(false)
+ .withDescription("");
+
+ public static final ConfigOption<Integer>
RSS_CLIENT_ASSIGNMENT_RETRY_INTERVAL =
+ ConfigOptions.key("tez.rss.client.assignment.retry.interval")
+ .intType()
+ .defaultValue(65000)
+ .withDescription("");
+
+ public static final ConfigOption<Integer> RSS_CLIENT_ASSIGNMENT_RETRY_TIMES =
+ ConfigOptions.key("tez.rss.client.assignment.retry.times")
+ .intType()
+ .defaultValue(3)
+ .withDescription("");
+
+ public static final ConfigOption<String> RSS_CLIENT_ASSIGNMENT_TAGS =
+ ConfigOptions.key("tez.rss.client.assignment.tags")
+ .stringType()
+ .defaultValue("")
+ .withDescription("");
+
+ public static final ConfigOption<Boolean> RSS_AM_SHUFFLE_MANAGER_DEBUG =
+ ConfigOptions.key("tez.rss.am.shuffle.manager.debug")
+ .booleanType()
+ .defaultValue(false)
+ .withDescription("");
+
+ public static final ConfigOption<String> RSS_AM_SHUFFLE_MANAGER_ADDRESS =
+ ConfigOptions.key("tez.rss.am.shuffle.manager.address")
+ .stringType()
+ .defaultValue("0.0.0.0")
+ .withDescription("");
+
+ public static final ConfigOption<Integer> RSS_AM_SHUFFLE_MANAGER_PORT =
+ ConfigOptions.key("tez.rss.am.shuffle.manager.port")
+ .intType()
+ .defaultValue(0)
+ .withDescription("");
+
+ public static final ConfigOption<Integer> RSS_ACCESS_TIMEOUT_MS =
+ ConfigOptions.key("tez.rss.access.timeout.ms")
+ .intType()
+ .defaultValue(10000)
+ .withDescription("");
+
+ public static final ConfigOption<String> RSS_REMOTE_STORAGE_PATH =
+ ConfigOptions.key("tez.rss.remote.storage.path")
+ .stringType()
+ .defaultValue("")
+ .withDescription("");
+
+ public static final ConfigOption<String> RSS_REMOTE_STORAGE_CONF =
+ ConfigOptions.key("tez.rss.remote.storage.conf")
+ .stringType()
+ .defaultValue("")
+ .withDescription("");
+
+ public static final ConfigOption<String> RSS_CLIENT_READ_BUFFER_SIZE =
+ ConfigOptions.key("tez.rss.client.read.buffer.size")
+ .stringType()
+ .defaultValue("14m")
+ .withDescription("");
+
+ public static final ConfigOption<Integer> RSS_PARTITION_NUM_PER_RANGE =
+ ConfigOptions.key("tez.rss.partitionNum.per.range")
+ .intType()
+ .defaultValue(1)
+ .withDescription("");
+
+ public static final ConfigOption<Float>
RSS_ESTIMATE_TASK_CONCURRENCY_DYNAMIC_FACTOR =
+ ConfigOptions.key("tez.rss.estimate.task.concurrency.dynamic.factor")
+ .floatType()
+ .defaultValue(1.0f)
+ .withDescription("");
+
+ public static final ConfigOption<Boolean>
RSS_ESTIMATE_SERVER_ASSIGNMENT_ENABLED =
+ ConfigOptions.key("tez.rss.estimate.server.assignment.enabled")
+ .booleanType()
+ .defaultValue(false)
+ .withDescription("");
+
+ public static final ConfigOption<Integer>
RSS_ESTIMATE_TASK_CONCURRENCY_PER_SERVER =
+ ConfigOptions.key("tez.rss.estimate.task.concurrency.per.server")
+ .intType()
+ .defaultValue(80)
+ .withDescription("");
+
+ public static final ConfigOption<Boolean> RSS_AVOID_RECOMPUTE_SUCCEEDED_TASK
=
+ ConfigOptions.key("tez.rss.avoid.recompute.succeeded.task")
+ .booleanType()
+ .defaultValue(false)
+ .withDescription("");
+
+ public static final ConfigOption<Integer>
RSS_CLIENT_ASSIGNMENT_SHUFFLE_SERVER_NUMBER =
+ ConfigOptions.key("rss.client.assignment.shuffle.nodes.max")
+ .intType()
+ .defaultValue(-1)
+ .withDescription("");
+
+ public static final ConfigOption<Integer> RSS_SHUFFLE_SOURCE_VERTEX_ID =
+ ConfigOptions.key("tez.rss.shuffle.source.vertex.id")
+ .intType()
+ .defaultValue(-1)
+ .withDescription("");
+
+ public static final ConfigOption<Integer> RSS_SHUFFLE_DESTINATION_VERTEX_ID =
+ ConfigOptions.key("tez.rss.shuffle.destination.vertex.id")
+ .intType()
+ .defaultValue(-1)
+ .withDescription("");
+
+ public static final ConfigOption<String> RSS_SHUFFLE_MODE =
+
ConfigOptions.key("tez.shuffle.mode").stringType().defaultValue("remote").withDescription("");
+
+ public static final ConfigOption<String> RSS_REMOTE_SPILL_STORAGE_PATH =
+ ConfigOptions.key("tez.rss.remote.spill.storage.path")
+ .stringType()
+ .defaultValue("")
+ .withDescription("");
+
+ public static final ConfigOption<Boolean> RSS_REDUCE_REMOTE_SPILL_ENABLED =
+ ConfigOptions.key("tez.rss.reduce.remote.spill.enable")
+ .booleanType()
+ .defaultValue(false)
+ .withDescription("");
+
+ public static final ConfigOption<Integer>
RSS_REDUCE_REMOTE_SPILL_REPLICATION =
+ ConfigOptions.key("tez.rss.reduce.remote.spill.replication")
+ .intType()
+ .defaultValue(1)
+ .withDescription("");
+
+ public static final ConfigOption<Integer> RSS_REDUCE_REMOTE_SPILL_RETRIES =
+ ConfigOptions.key("tez.rss.reduce.remote.spill.retries")
+ .intType()
+ .defaultValue(5)
+ .withDescription("");
+
+ public static final ConfigOption<Boolean> TEZ_RSS_TEST_MODE_ENABLE =
+ ConfigOptions.key("tez.rss.test.mode.enable")
+ .booleanType()
+ .defaultValue(false)
+ .withDescription("Whether enable test mode for the shuffle server.");
+
+ public static final Set<String> RSS_MANDATORY_CLUSTER_CONF =
+ ImmutableSet.of(RSS_STORAGE_TYPE.key(), RSS_REMOTE_STORAGE_PATH.key());
+
+ public Configuration getHadoopConfig() {
+ return hadoopConfig;
+ }
+
+ private final Configuration hadoopConfig;
+
+ public TezClientConf() {
+ this(new Configuration());
+ }
+
+ public TezClientConf(Configuration config) {
+ super();
+ boolean ret = loadConfFromHadoopConfig(config);
+ if (!ret) {
+ throw new IllegalStateException("Fail to load config " + config);
+ }
+ this.hadoopConfig = config;
+ }
+
+ public boolean loadConfFromHadoopConfig(Configuration config) {
+ return loadConfFromHadoopConfig(config,
ConfigUtils.getAllConfigOptions(TezClientConf.class));
+ }
+
+ public RssConf toRssConf() {
Review Comment:
I see you!
But I don't know the design of these issue. How about RssClientConfig?
Maybe RssClientConfig should be extended from RssConf or RssBaseConf.
RssTezConfig should be extended from RssClientConfig.
The the config key in RssXXXConfig should not be start with "tez", and the
config key in hadoop Configuration should be start with "tez". That's my
understanding, maybe it is wrong.
What do you think? @lifeSo
@zuston Can you give us some advice?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
