This is an automated email from the ASF dual-hosted git repository. captainzmc pushed a commit to branch HDDS-4454 in repository https://gitbox.apache.org/repos/asf/ozone.git
commit 9204b35f2b8d5edc55809559c77ecd311d20d996 Author: hao guo <[email protected]> AuthorDate: Mon Nov 15 23:54:36 2021 +0800 HDDS-5987. [Ozone-Streaming] Add XceiverClientRatis stream config (#2841) --- .../src/main/java/org/apache/hadoop/hdds/ratis/RatisHelper.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/ratis/RatisHelper.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/ratis/RatisHelper.java index 164044ced0..43b34a1563 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/ratis/RatisHelper.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/ratis/RatisHelper.java @@ -49,6 +49,7 @@ import org.apache.ratis.conf.RaftProperties; import org.apache.ratis.datastream.SupportedDataStreamType; import org.apache.ratis.grpc.GrpcConfigKeys; import org.apache.ratis.grpc.GrpcTlsConfig; +import org.apache.ratis.netty.NettyConfigKeys; import org.apache.ratis.proto.RaftProtos; import org.apache.ratis.protocol.RaftGroup; import org.apache.ratis.protocol.RaftGroupId; @@ -317,7 +318,8 @@ public final class RatisHelper { Map<String, String> ratisClientConf = getDatanodeRatisPrefixProps(ozoneConf); ratisClientConf.forEach((key, val) -> { - if (isClientConfig(key) || isGrpcClientConfig(key)) { + if (isClientConfig(key) || isGrpcClientConfig(key) + || isNettyStreamConfig(key)) { raftProperties.set(key, val); } }); @@ -333,6 +335,11 @@ public final class RatisHelper { !key.startsWith(GrpcConfigKeys.Admin.PREFIX) && !key.startsWith(GrpcConfigKeys.Server.PREFIX); } + + private static boolean isNettyStreamConfig(String key) { + return key.startsWith(NettyConfigKeys.DataStream.PREFIX); + } + /** * Set all server properties matching with prefix * {@link RatisHelper#HDDS_DATANODE_RATIS_PREFIX_KEY} in --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
