YARN-3473. Fix RM Web UI configuration for some properties (rchiang via rkanter)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/56589988 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/56589988 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/56589988 Branch: refs/heads/HDFS-7240 Commit: 5658998845bbeb3f09037a891f6b254585848de7 Parents: 315074b Author: Robert Kanter <[email protected]> Authored: Fri May 8 16:23:10 2015 -0700 Committer: Robert Kanter <[email protected]> Committed: Fri May 8 16:23:10 2015 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 2 ++ .../hadoop/yarn/server/resourcemanager/ResourceManager.java | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/56589988/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 83985b5..02226db 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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/56589988/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java ---------------------------------------------------------------------- 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 130cfd4..c209873 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);
