YARN-8062. yarn rmadmin -getGroups returns group from which the user has been removed. (Sunil G via wangda)
Change-Id: I80ed63846502bf7751b890b6c6c6a7c0679e2b4a (cherry picked from commit 5d381570f83022b411a8740d58486a7f68ab2af6) (cherry picked from commit 54da6a0d78c7832d647831b73030a1f75db932a9) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0b7eed5e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0b7eed5e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0b7eed5e Branch: refs/heads/branch-3.1.0 Commit: 0b7eed5e34c6b0b4c2770e196c8731d9938d9c1d Parents: aa66e7c Author: Wangda Tan <[email protected]> Authored: Mon Mar 26 11:16:06 2018 -0700 Committer: Wangda Tan <[email protected]> Committed: Thu Mar 29 09:45:03 2018 -0700 ---------------------------------------------------------------------- .../server/resourcemanager/ResourceManager.java | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0b7eed5e/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 cd08beb..733da5b 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 @@ -253,9 +253,8 @@ public class ResourceManager extends CompositeService implements Recoverable { // load core-site.xml loadConfigurationXml(YarnConfiguration.CORE_SITE_CONFIGURATION_FILE); - // Do refreshUserToGroupsMappings with loaded core-site.xml - Groups.getUserToGroupsMappingServiceWithLoadedConfiguration(this.conf) - .refresh(); + // 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 @@ -340,6 +339,21 @@ 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 = --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
