diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 83985b5245..02226db371 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -371,6 +371,8 @@ Release 2.8.0 - UNRELEASED YARN-3604. Fixed ZKRMStateStore#removeApplication to also disable watch. (zhihai xu via jianhe) + YARN-3473. Fix RM Web UI configuration for some properties (rchiang via rkanter) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java index 130cfd4a4e..c209873495 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java @@ -200,7 +200,8 @@ public class ResourceManager extends CompositeService implements Recoverable { 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 @@ -218,7 +219,8 @@ public class ResourceManager extends CompositeService implements Recoverable { 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);