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 xy...@apache.org on 2018/06/08 17:12:46 UTC
[25/50] hadoop git commit: HDDS-107. TestOzoneConfigurationFields is
failing. Contributed by LiXin Ge & Mukul Kumar Singh.
HDDS-107. TestOzoneConfigurationFields is failing.
Contributed by LiXin Ge & Mukul Kumar Singh.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/30f0582f
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/30f0582f
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/30f0582f
Branch: refs/heads/HDDS-4
Commit: 30f0582f2b8bdf2e9368e84078f5a7aba033f9ff
Parents: d1992ab
Author: Anu Engineer <ae...@apache.org>
Authored: Wed Jun 6 08:39:18 2018 -0700
Committer: Anu Engineer <ae...@apache.org>
Committed: Wed Jun 6 08:39:18 2018 -0700
----------------------------------------------------------------------
.../main/java/org/apache/hadoop/hdds/conf/HddsConfServlet.java | 5 ++++-
.../src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java | 2 ++
.../org/apache/hadoop/ozone/TestOzoneConfigurationFields.java | 1 +
3 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/30f0582f/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/HddsConfServlet.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/HddsConfServlet.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/HddsConfServlet.java
index 521408b..677b752 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/HddsConfServlet.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/HddsConfServlet.java
@@ -39,6 +39,8 @@ import com.google.common.annotations.VisibleForTesting;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_TAGS_SYSTEM_KEY;
+
/**
* A servlet to print out the running configuration data.
*/
@@ -154,7 +156,8 @@ public class HddsConfServlet extends HttpServlet {
switch (cmd) {
case "getOzoneTags":
- out.write(gson.toJson(config.get("ozone.tags.system").split(",")));
+ out.write(gson.toJson(config.get(OZONE_TAGS_SYSTEM_KEY)
+ .split(",")));
break;
case "getPropertyByTag":
String tags = request.getParameter("tags");
http://git-wip-us.apache.org/repos/asf/hadoop/blob/30f0582f/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java
index d1377be..856d088 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java
@@ -31,6 +31,8 @@ import org.apache.ratis.util.TimeDuration;
@InterfaceAudience.Public
@InterfaceStability.Unstable
public final class OzoneConfigKeys {
+ public static final String OZONE_TAGS_SYSTEM_KEY =
+ "ozone.tags.system";
public static final String DFS_CONTAINER_IPC_PORT =
"dfs.container.ipc";
public static final int DFS_CONTAINER_IPC_PORT_DEFAULT = 9859;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/30f0582f/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java
----------------------------------------------------------------------
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java
index 533a3b4..4898a1b 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java
@@ -34,5 +34,6 @@ public class TestOzoneConfigurationFields extends TestConfigurationFieldsBase {
KSMConfigKeys.class};
errorIfMissingConfigProps = true;
errorIfMissingXmlProps = true;
+ xmlPropsToSkipCompare.add("hadoop.tags.custom");
}
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org