This is an automated email from the ASF dual-hosted git repository.
ayushsaxena pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new c958bfb HDDS-4449. Rename config ozone.datanode.pipeline.limit (#1648)
c958bfb is described below
commit c958bfb4070aab1068d7e455792957fc116a31fc
Author: wycccccc <[email protected]>
AuthorDate: Mon Dec 21 23:59:14 2020 +0800
HDDS-4449. Rename config ozone.datanode.pipeline.limit (#1648)
---
.../src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java | 3 +++
.../common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java | 2 +-
hadoop-hdds/common/src/main/resources/ozone-default.xml | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java
index 4b26cf1..d73c605 100644
---
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java
+++
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java
@@ -38,6 +38,7 @@ import java.util.stream.Collectors;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hdds.annotation.InterfaceAudience;
+import org.apache.hadoop.hdds.scm.ScmConfigKeys;
import org.apache.hadoop.hdds.utils.LegacyHadoopConfigurationSource;
import com.google.common.base.Preconditions;
@@ -295,6 +296,8 @@ public class OzoneConfiguration extends Configuration
private static void addDeprecatedKeys(){
Configuration.addDeprecations(new DeprecationDelta[]{
+ new DeprecationDelta("ozone.datanode.pipeline.limit",
+ ScmConfigKeys.OZONE_DATANODE_PIPELINE_LIMIT),
new DeprecationDelta(HDDS_DATANODE_RATIS_PREFIX_KEY + "."
+ RaftServerConfigKeys.PREFIX + "." + "rpcslowness.timeout",
HDDS_DATANODE_RATIS_PREFIX_KEY + "."
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java
index b671e98..e5958b7 100644
---
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java
+++
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java
@@ -298,7 +298,7 @@ public final class ScmConfigKeys {
// Pipeline placement policy:
// Upper limit for how many pipelines a datanode can engage in.
public static final String OZONE_DATANODE_PIPELINE_LIMIT =
- "ozone.datanode.pipeline.limit";
+ "ozone.scm.datanode.pipeline.limit";
public static final int OZONE_DATANODE_PIPELINE_LIMIT_DEFAULT = 2;
// Upper limit for how many pipelines can be created
diff --git a/hadoop-hdds/common/src/main/resources/ozone-default.xml
b/hadoop-hdds/common/src/main/resources/ozone-default.xml
index b2bffe3..98f585e 100644
--- a/hadoop-hdds/common/src/main/resources/ozone-default.xml
+++ b/hadoop-hdds/common/src/main/resources/ozone-default.xml
@@ -776,7 +776,7 @@
</description>
</property>
<property>
- <name>ozone.datanode.pipeline.limit</name>
+ <name>ozone.scm.datanode.pipeline.limit</name>
<value>2</value>
<tag>OZONE, SCM, PIPELINE</tag>
<description>Max number of pipelines per datanode can be engaged in.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
