From 1b2f52227497536d1b853fbd663085d88639faf8 Mon Sep 17 00:00:00 2001 From: Sunil G Date: Fri, 23 Mar 2018 14:37:01 +0530 Subject: [PATCH] YARN-8062 --- .../apache/hadoop/yarn/server/resourcemanager/ResourceManager.java | 4 ---- .../apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) 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 5140c9fa558..272653aeb7b 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 @@ -260,10 +260,6 @@ protected void serviceInit(Configuration conf) throws Exception { // load core-site.xml loadConfigurationXml(YarnConfiguration.CORE_SITE_CONFIGURATION_FILE); - // Do refreshUserToGroupsMappings with loaded core-site.xml - Groups.getUserToGroupsMappingServiceWithLoadedConfiguration(this.conf) - .refresh(); - // Do refreshSuperUserGroupsConfiguration with loaded core-site.xml // Or use RM specific configurations to overwrite the common ones first // if they exist diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java index 03fc0813335..e5d75d1e028 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java @@ -722,6 +722,8 @@ public void testRefreshUserToGroupsMappingsWithLocalConfigurationProvider() { } // Make sure RM will use the updated GroupMappingServiceProvider + rm.adminService.refreshUserToGroupsMappings( + RefreshUserToGroupsMappingsRequest.newInstance()); List groupBefore = new ArrayList(Groups.getUserToGroupsMappingService( configuration).getGroups(user)); @@ -1099,6 +1101,8 @@ public void testRMInitialsWithFileSystemBasedConfigurationProvider() .get("hadoop.proxyuser.test.hosts").contains("test_hosts")); // verify UserToGroupsMappings + resourceManager.adminService.refreshUserToGroupsMappings( + RefreshUserToGroupsMappingsRequest.newInstance()); List groupAfter = Groups.getUserToGroupsMappingService(configuration).getGroups( UserGroupInformation.getCurrentUser().getUserName()); -- 2.14.3 (Apple Git-98)