Repository: hadoop
Updated Branches:
  refs/heads/branch-2 92b7491f2 -> 2226ae492


YARN-4998. Minor cleanup to UGI use in AdminService. (Daniel Templeton via 
kasha)

(cherry picked from commit 733aa993134ba324c712590fa92b8ef230b0839a)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2226ae49
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2226ae49
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2226ae49

Branch: refs/heads/branch-2
Commit: 2226ae492444bbc6bceb428473b4f56add915b33
Parents: 92b7491
Author: Karthik Kambatla <ka...@cloudera.com>
Authored: Mon Oct 31 16:02:50 2016 -0700
Committer: Karthik Kambatla <ka...@cloudera.com>
Committed: Mon Oct 31 16:26:15 2016 -0700

----------------------------------------------------------------------
 .../hadoop/yarn/server/resourcemanager/AdminService.java       | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/2226ae49/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.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/AdminService.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java
index 33daf7f..c060659 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java
@@ -154,8 +154,7 @@ public class AdminService extends CompositeService 
implements
         YarnConfiguration.DEFAULT_RM_ADMIN_PORT);
     daemonUser = UserGroupInformation.getCurrentUser();
     authorizer = YarnAuthorizationProvider.getInstance(conf);
-    authorizer.setAdmins(getAdminAclList(conf), UserGroupInformation
-        .getCurrentUser());
+    authorizer.setAdmins(getAdminAclList(conf), daemonUser);
     rmId = conf.get(YarnConfiguration.RM_HA_ID);
 
     isCentralizedNodeLabelConfiguration =
@@ -542,8 +541,7 @@ public class AdminService extends CompositeService 
implements
     Configuration conf =
         getConfiguration(new Configuration(false),
             YarnConfiguration.YARN_SITE_CONFIGURATION_FILE);
-    authorizer.setAdmins(getAdminAclList(conf), UserGroupInformation
-        .getCurrentUser());
+    authorizer.setAdmins(getAdminAclList(conf), daemonUser);
     RMAuditLogger.logSuccess(user.getShortUserName(), operation,
         "AdminService");
 


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

Reply via email to