You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ar...@apache.org on 2018/05/22 20:15:05 UTC
[37/50] [abbrv] hadoop git commit: HADOOP-15474. Rename properties
introduced for . Contributed by Zsolt Venczel.
HADOOP-15474. Rename properties introduced for <tags>. Contributed by Zsolt Venczel.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/57c2feb0
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/57c2feb0
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/57c2feb0
Branch: refs/heads/HDDS-48
Commit: 57c2feb0d3ed0bb4f8642300433a35f5e28071c9
Parents: 5e88126
Author: Mukul Kumar Singh <ms...@apache.org>
Authored: Tue May 22 13:33:31 2018 +0530
Committer: Mukul Kumar Singh <ms...@apache.org>
Committed: Tue May 22 13:33:31 2018 +0530
----------------------------------------------------------------------
.../org/apache/hadoop/conf/Configuration.java | 18 +++++++++++++++---
.../hadoop/fs/CommonConfigurationKeysPublic.java | 15 +++++++++++++++
.../src/main/resources/core-default.xml | 11 ++++++++++-
.../org/apache/hadoop/conf/TestConfiguration.java | 4 ++--
4 files changed, 42 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/57c2feb0/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
index 52f20b0..19bd5da 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
@@ -198,8 +198,8 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank;
* <h4 id="Tags">Tags</h4>
*
* <p>Optionally we can tag related properties together by using tag
- * attributes. System tags are defined by hadoop.system.tags property. Users
- * can define there own custom tags in hadoop.custom.tags property.
+ * attributes. System tags are defined by hadoop.tags.system property. Users
+ * can define there own custom tags in hadoop.tags.custom property.
*
* <p>For example, we can tag existing property as:
* <tt><pre>
@@ -3180,12 +3180,24 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
}
/**
- * Add tags defined in HADOOP_SYSTEM_TAGS, HADOOP_CUSTOM_TAGS.
+ * Add tags defined in HADOOP_TAGS_SYSTEM, HADOOP_TAGS_CUSTOM.
* @param prop
*/
public void addTags(Properties prop) {
// Get all system tags
try {
+ if (prop.containsKey(CommonConfigurationKeys.HADOOP_TAGS_SYSTEM)) {
+ String systemTags = prop.getProperty(CommonConfigurationKeys
+ .HADOOP_TAGS_SYSTEM);
+ Arrays.stream(systemTags.split(",")).forEach(tag -> TAGS.add(tag));
+ }
+ // Get all custom tags
+ if (prop.containsKey(CommonConfigurationKeys.HADOOP_TAGS_CUSTOM)) {
+ String customTags = prop.getProperty(CommonConfigurationKeys
+ .HADOOP_TAGS_CUSTOM);
+ Arrays.stream(customTags.split(",")).forEach(tag -> TAGS.add(tag));
+ }
+
if (prop.containsKey(CommonConfigurationKeys.HADOOP_SYSTEM_TAGS)) {
String systemTags = prop.getProperty(CommonConfigurationKeys
.HADOOP_SYSTEM_TAGS);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/57c2feb0/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java
index 8cd753a..8837cfb 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java
@@ -881,7 +881,22 @@ public class CommonConfigurationKeysPublic {
"credential$",
"oauth.*token$",
HADOOP_SECURITY_SENSITIVE_CONFIG_KEYS);
+
+ /**
+ * @deprecated Please use
+ * {@link CommonConfigurationKeysPublic#HADOOP_TAGS_SYSTEM} instead
+ * See https://issues.apache.org/jira/browse/HADOOP-15474
+ */
public static final String HADOOP_SYSTEM_TAGS = "hadoop.system.tags";
+
+ /**
+ * @deprecated Please use
+ * {@link CommonConfigurationKeysPublic#HADOOP_TAGS_CUSTOM} instead
+ * See https://issues.apache.org/jira/browse/HADOOP-15474
+ */
public static final String HADOOP_CUSTOM_TAGS = "hadoop.custom.tags";
+
+ public static final String HADOOP_TAGS_SYSTEM = "hadoop.tags.system";
+ public static final String HADOOP_TAGS_CUSTOM = "hadoop.tags.custom";
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/57c2feb0/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
index 7ba23d4..fad2985 100644
--- a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
+++ b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
@@ -3035,7 +3035,16 @@
<property>
<name>hadoop.system.tags</name>
<value>YARN,HDFS,NAMENODE,DATANODE,REQUIRED,SECURITY,KERBEROS,PERFORMANCE,CLIENT
- ,SERVER,DEBUG,DEPRICATED,COMMON,OPTIONAL</value>
+ ,SERVER,DEBUG,DEPRECATED,COMMON,OPTIONAL</value>
+ <description>
+ Deprecated. Please use hadoop.tags.system instead.
+ </description>
+ </property>
+
+ <property>
+ <name>hadoop.tags.system</name>
+ <value>YARN,HDFS,NAMENODE,DATANODE,REQUIRED,SECURITY,KERBEROS,PERFORMANCE,CLIENT
+ ,SERVER,DEBUG,DEPRECATED,COMMON,OPTIONAL</value>
<description>
System tags to group related properties together.
</description>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/57c2feb0/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java
index 33a9880..e865bf1 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java
@@ -2361,8 +2361,8 @@ public class TestConfiguration {
try{
out = new BufferedWriter(new FileWriter(CONFIG_CORE));
startConfig();
- appendProperty("hadoop.system.tags", "YARN,HDFS,NAMENODE");
- appendProperty("hadoop.custom.tags", "MYCUSTOMTAG");
+ appendProperty("hadoop.tags.system", "YARN,HDFS,NAMENODE");
+ appendProperty("hadoop.tags.custom", "MYCUSTOMTAG");
appendPropertyByTag("dfs.cblock.trace.io", "false", "YARN");
appendPropertyByTag("dfs.replication", "1", "HDFS");
appendPropertyByTag("dfs.namenode.logging.level", "INFO", "NAMENODE");
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org