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 vi...@apache.org on 2014/11/08 04:44:32 UTC
hadoop git commit: YARN-2826. Fixed user-groups mappings' refresh bug
caused by YARN-2826. Contributed by Wangda Tan.
Repository: hadoop
Updated Branches:
refs/heads/trunk 4a114dd67 -> df36edf75
YARN-2826. Fixed user-groups mappings' refresh bug caused by YARN-2826. Contributed by Wangda Tan.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/df36edf7
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/df36edf7
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/df36edf7
Branch: refs/heads/trunk
Commit: df36edf751202db00d8f43103d7120ec56d70a04
Parents: 4a114dd
Author: Vinod Kumar Vavilapalli <vi...@apache.org>
Authored: Fri Nov 7 19:43:55 2014 -0800
Committer: Vinod Kumar Vavilapalli <vi...@apache.org>
Committed: Fri Nov 7 19:43:55 2014 -0800
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 ++
.../server/resourcemanager/ResourceManager.java | 32 ++++++++++----------
2 files changed, 19 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/df36edf7/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index d4c8827..1e6406a 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -914,6 +914,9 @@ Release 2.6.0 - UNRELEASED
YARN-2819. NPE in ATS Timeline Domains when upgrading from 2.4 to 2.6.
(Zhijie Shen via xgong)
+ YARN-2826. Fixed user-groups mappings' refresh bug caused by YARN-2826.
+ (Wangda Tan via vinodkv)
+
Release 2.5.2 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/df36edf7/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 4051054..e0840b6 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
@@ -194,22 +194,6 @@ public class ResourceManager extends CompositeService implements Recoverable {
this.conf = conf;
this.rmContext = new RMContextImpl();
- // Set HA configuration should be done before login
- this.rmContext.setHAEnabled(HAUtil.isHAEnabled(this.conf));
- if (this.rmContext.isHAEnabled()) {
- HAUtil.verifyAndSetConfiguration(this.conf);
- }
-
- // Set UGI and do login
- // If security is enabled, use login user
- // If security is not enabled, use current user
- this.rmLoginUGI = UserGroupInformation.getCurrentUser();
- try {
- doSecureLogin();
- } catch(IOException ie) {
- throw new YarnRuntimeException("Failed to login", ie);
- }
-
this.configurationProvider =
ConfigurationProviderFactory.getConfigurationProvider(conf);
this.configurationProvider.init(this.conf);
@@ -242,6 +226,22 @@ public class ResourceManager extends CompositeService implements Recoverable {
}
validateConfigs(this.conf);
+
+ // Set HA configuration should be done before login
+ this.rmContext.setHAEnabled(HAUtil.isHAEnabled(this.conf));
+ if (this.rmContext.isHAEnabled()) {
+ HAUtil.verifyAndSetConfiguration(this.conf);
+ }
+
+ // Set UGI and do login
+ // If security is enabled, use login user
+ // If security is not enabled, use current user
+ this.rmLoginUGI = UserGroupInformation.getCurrentUser();
+ try {
+ doSecureLogin();
+ } catch(IOException ie) {
+ throw new YarnRuntimeException("Failed to login", ie);
+ }
// register the handlers for all AlwaysOn services using setupDispatcher().
rmDispatcher = setupDispatcher();