Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-3473. Fix RM Web UI configuration for some properties (rchiang via rkanter) 

(cherry picked from commit 5658998845)
This commit is contained in:
Robert Kanter 2015-05-08 16:23:10 -07:00
parent 015b30c3ab
commit 453488cff2
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-yarn-project/CHANGES.txt
View File

@ -326,6 +326,8 @@ Release 2.8.0 - UNRELEASED
YARN-3604. Fixed ZKRMStateStore#removeApplication to also disable watch. YARN-3604. Fixed ZKRMStateStore#removeApplication to also disable watch.
(zhihai xu via jianhe) (zhihai xu via jianhe)
YARN-3473. Fix RM Web UI configuration for some properties (rchiang via rkanter)
Release 2.7.1 - UNRELEASED Release 2.7.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

6
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
View File

@ -200,7 +200,8 @@ public class ResourceManager extends CompositeService implements Recoverable {
this.configurationProvider.getConfigurationInputStream(this.conf, this.configurationProvider.getConfigurationInputStream(this.conf,
YarnConfiguration.CORE_SITE_CONFIGURATION_FILE); YarnConfiguration.CORE_SITE_CONFIGURATION_FILE);
if (coreSiteXMLInputStream != null) { if (coreSiteXMLInputStream != null) {
this.conf.addResource(coreSiteXMLInputStream); this.conf.addResource(coreSiteXMLInputStream,
YarnConfiguration.CORE_SITE_CONFIGURATION_FILE);
} }
// Do refreshUserToGroupsMappings with loaded core-site.xml // Do refreshUserToGroupsMappings with loaded core-site.xml
@ -218,7 +219,8 @@ public class ResourceManager extends CompositeService implements Recoverable {
this.configurationProvider.getConfigurationInputStream(this.conf, this.configurationProvider.getConfigurationInputStream(this.conf,
YarnConfiguration.YARN_SITE_CONFIGURATION_FILE); YarnConfiguration.YARN_SITE_CONFIGURATION_FILE);
if (yarnSiteXMLInputStream != null) { if (yarnSiteXMLInputStream != null) {
this.conf.addResource(yarnSiteXMLInputStream); this.conf.addResource(yarnSiteXMLInputStream,
YarnConfiguration.YARN_SITE_CONFIGURATION_FILE);
} }
validateConfigs(this.conf); validateConfigs(this.conf);