Browse Source

HDFS-12941. Ozone: ConfServlet does not trim values during the description parsing. Contributed by Elek, Marton.

Mukul Kumar Singh 7 years ago
parent
commit
8e44ce9382

+ 2 - 2
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) {

+ 1 - 1
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>