YARN-8145. yarn rmadmin -getGroups doesn't return updated groups for user. Contributed by Sunil G.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/241d9854 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/241d9854 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/241d9854 Branch: refs/heads/trunk Commit: 241d985467c4a318fa22a3f3007ee1827c94389c Parents: 1312f9a Author: Rohith Sharma K S <[email protected]> Authored: Wed Apr 18 13:32:50 2018 +0530 Committer: Rohith Sharma K S <[email protected]> Committed: Wed Apr 18 13:39:41 2018 +0530 ---------------------------------------------------------------------- .../server/resourcemanager/ResourceManager.java | 19 ------------------- .../resourcemanager/TestRMAdminService.java | 2 ++ 2 files changed, 2 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/241d9854/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 f5d84a3..a7d2fe8 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 @@ -34,7 +34,6 @@ import org.apache.hadoop.metrics2.MetricsSystem; import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem; import org.apache.hadoop.metrics2.source.JvmMetrics; import org.apache.hadoop.net.NetUtils; -import org.apache.hadoop.security.Groups; import org.apache.hadoop.security.SecurityUtil; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.authorize.ProxyUsers; @@ -254,9 +253,6 @@ public class ResourceManager extends CompositeService implements Recoverable { // load core-site.xml loadConfigurationXml(YarnConfiguration.CORE_SITE_CONFIGURATION_FILE); - // Refresh user to group mappings during init. - refreshUserToGroupMappingsWithConf(); - // Do refreshSuperUserGroupsConfiguration with loaded core-site.xml // Or use RM specific configurations to overwrite the common ones first // if they exist @@ -340,21 +336,6 @@ public class ResourceManager extends CompositeService implements Recoverable { super.serviceInit(this.conf); } - private void refreshUserToGroupMappingsWithConf() - throws YarnException, IOException { - Configuration newConf = new Configuration(false); - InputStream confFileInputStream = - configurationProvider - .getConfigurationInputStream(newConf, YarnConfiguration.CORE_SITE_CONFIGURATION_FILE); - if (confFileInputStream != null) { - newConf.addResource(confFileInputStream); - } - - // Do refreshUserToGroupsMappings with loaded core-site.xml - Groups.getUserToGroupsMappingServiceWithLoadedConfiguration(newConf) - .refresh(); - } - private void loadConfigurationXml(String configurationFile) throws YarnException, IOException { InputStream configurationInputStream = http://git-wip-us.apache.org/repos/asf/hadoop/blob/241d9854/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java ---------------------------------------------------------------------- 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 03fc081..f0484e1 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,7 @@ public class TestRMAdminService { } // Make sure RM will use the updated GroupMappingServiceProvider + Groups.getUserToGroupsMappingServiceWithLoadedConfiguration(conf).refresh(); List<String> groupBefore = new ArrayList<String>(Groups.getUserToGroupsMappingService( configuration).getGroups(user)); @@ -1099,6 +1100,7 @@ public class TestRMAdminService { .get("hadoop.proxyuser.test.hosts").contains("test_hosts")); // verify UserToGroupsMappings + Groups.getUserToGroupsMappingServiceWithLoadedConfiguration(conf).refresh(); List<String> groupAfter = Groups.getUserToGroupsMappingService(configuration).getGroups( UserGroupInformation.getCurrentUser().getUserName()); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
