You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by zj...@apache.org on 2015/05/09 02:42:36 UTC
[42/50] hadoop git commit: YARN-3473. Fix RM Web UI configuration for
some properties (rchiang via rkanter)
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/ca2c2251
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ca2c2251
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ca2c2251
Branch: refs/heads/YARN-2928
Commit: ca2c2251bc97b4e9eacf89ec92360a9a441e9917
Parents: 4495aef
Author: Robert Kanter <rk...@apache.org>
Authored: Fri May 8 16:23:10 2015 -0700
Committer: Zhijie Shen <zj...@apache.org>
Committed: Fri May 8 17:40:24 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/ca2c2251/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index cd59bd0..115e8d9 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -441,6 +441,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/ca2c2251/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 0b9937e..0feb227 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
@@ -201,7 +201,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
@@ -219,7 +220,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);