Repository: hadoop Updated Branches: refs/heads/HDFS-7240 95f367b9c -> 8e44ce938
HDFS-12941. Ozone: ConfServlet does not trim values during the description parsing. Contributed by Elek, Marton. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8e44ce93 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8e44ce93 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8e44ce93 Branch: refs/heads/HDFS-7240 Commit: 8e44ce9382076d3184181d7dfc2036d852785a8e Parents: 95f367b Author: Mukul Kumar Singh <msi...@apache.org> Authored: Wed Dec 20 19:33:51 2017 +0530 Committer: Mukul Kumar Singh <msi...@apache.org> Committed: Wed Dec 20 19:33:51 2017 +0530 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/conf/ConfServlet.java | 4 ++-- .../hadoop-hdfs/src/main/resources/ozone-default.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/8e44ce93/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ConfServlet.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ConfServlet.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ConfServlet.java index 217f864..ac4efea 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ConfServlet.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ConfServlet.java @@ -165,8 +165,8 @@ public class ConfServlet extends HttpServlet { propList = config.readPropertyFromXml(config.getResource("ozone-default" + ".xml")); propList.stream().forEach(p -> { - if (!propertyMap.containsKey(p.getName())) { - propertyMap.put(p.getName(), p); + if (!propertyMap.containsKey(p.getName().trim())) { + propertyMap.put(p.getName().trim(), p); } }); } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/hadoop/blob/8e44ce93/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/ozone-default.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/ozone-default.xml b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/ozone-default.xml index 1c8d086..31c3901 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/ozone-default.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/ozone-default.xml @@ -1220,7 +1220,7 @@ </property> <property> - <name>ozone.open.key.expire.threshold </name> + <name>ozone.open.key.expire.threshold</name> <value>86400</value> <tag>OZONE, KSM, PERFORMANCE</tag> <description> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org