From 87339d769163edb88c798e8adfdd742c094e85c6 Mon Sep 17 00:00:00 2001 From: Ravi Prakash Date: Thu, 23 Mar 2017 09:28:10 -0700 Subject: [PATCH] HADOOP-14213. Move Configuration runtime check for hadoop-site.xml to initialization. Contributed by Jonathan Eagles (cherry picked from commit 595f62e362c08704d6fb692e21c97b512bc7ec49) --- .../org/apache/hadoop/conf/Configuration.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) 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 005984d3cb6..2528da9789b 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 @@ -655,21 +655,24 @@ private void handleDeprecation() { } } - static{ - //print deprecation warning if hadoop-site.xml is found in classpath + static { + // Add default resources + addDefaultResource("core-default.xml"); + addDefaultResource("core-site.xml"); + + // print deprecation warning if hadoop-site.xml is found in classpath ClassLoader cL = Thread.currentThread().getContextClassLoader(); if (cL == null) { cL = Configuration.class.getClassLoader(); } - if(cL.getResource("hadoop-site.xml")!=null) { + if (cL.getResource("hadoop-site.xml") != null) { LOG.warn("DEPRECATED: hadoop-site.xml found in the classpath. " + "Usage of hadoop-site.xml is deprecated. Instead use core-site.xml, " + "mapred-site.xml and hdfs-site.xml to override properties of " + "core-default.xml, mapred-default.xml and hdfs-default.xml " + "respectively"); + addDefaultResource("hadoop-site.xml"); } - addDefaultResource("core-default.xml"); - addDefaultResource("core-site.xml"); } private Properties properties; @@ -2557,11 +2560,6 @@ private void loadResources(Properties properties, for (String resource : defaultResources) { loadResource(properties, new Resource(resource), quiet); } - - //support the hadoop-site.xml as a deprecated case - if(getResource("hadoop-site.xml")!=null) { - loadResource(properties, new Resource("hadoop-site.xml"), quiet); - } } for (int i = 0; i < resources.size(); i++) {