diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java index 8bd8e2161c234333e12e850e9360d5b17dce06c2..a596c99389685e2f7e7cc70292bd7973a180e378 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java @@ -198,7 +198,8 @@ protected void serviceInit(Configuration conf) throws Exception { this.configurationProvider.getConfigurationInputStream(this.conf, YarnConfiguration.CORE_SITE_CONFIGURATION_FILE); if (coreSiteXMLInputStream != null) { - this.conf.addResource(coreSiteXMLInputStream); + this.conf.addResource(coreSiteXMLInputStream, + YarnConfiguration.CORE_SITE_CONFIGURATION_FILE); } // Do refreshUserToGroupsMappings with loaded core-site.xml @@ -216,7 +217,8 @@ protected void serviceInit(Configuration conf) throws Exception { this.configurationProvider.getConfigurationInputStream(this.conf, YarnConfiguration.YARN_SITE_CONFIGURATION_FILE); if (yarnSiteXMLInputStream != null) { - this.conf.addResource(yarnSiteXMLInputStream); + this.conf.addResource(yarnSiteXMLInputStream, + YarnConfiguration.YARN_SITE_CONFIGURATION_FILE); } validateConfigs(this.conf);