Browse Source

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

Karthik Kambatla 8 years ago
parent
commit
733aa99313

+ 2 - 4
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);
         YarnConfiguration.DEFAULT_RM_ADMIN_PORT);
     daemonUser = UserGroupInformation.getCurrentUser();
     daemonUser = UserGroupInformation.getCurrentUser();
     authorizer = YarnAuthorizationProvider.getInstance(conf);
     authorizer = YarnAuthorizationProvider.getInstance(conf);
-    authorizer.setAdmins(getAdminAclList(conf), UserGroupInformation
-        .getCurrentUser());
+    authorizer.setAdmins(getAdminAclList(conf), daemonUser);
     rmId = conf.get(YarnConfiguration.RM_HA_ID);
     rmId = conf.get(YarnConfiguration.RM_HA_ID);
 
 
     isCentralizedNodeLabelConfiguration =
     isCentralizedNodeLabelConfiguration =
@@ -542,8 +541,7 @@ public class AdminService extends CompositeService implements
     Configuration conf =
     Configuration conf =
         getConfiguration(new Configuration(false),
         getConfiguration(new Configuration(false),
             YarnConfiguration.YARN_SITE_CONFIGURATION_FILE);
             YarnConfiguration.YARN_SITE_CONFIGURATION_FILE);
-    authorizer.setAdmins(getAdminAclList(conf), UserGroupInformation
-        .getCurrentUser());
+    authorizer.setAdmins(getAdminAclList(conf), daemonUser);
     RMAuditLogger.logSuccess(user.getShortUserName(), operation,
     RMAuditLogger.logSuccess(user.getShortUserName(), operation,
         "AdminService");
         "AdminService");