From 16ad6fbfadd9bef56ab8c8e9a8112f5af05045cf Mon Sep 17 00:00:00 2001 From: Sunil G Date: Fri, 23 Mar 2018 21:56:07 +0530 Subject: [PATCH] YARN-8062 --- .../yarn/server/resourcemanager/ResourceManager.java | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 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..38da7f5e5c3 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,9 +260,8 @@ 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(); + // 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 @@ -347,6 +346,21 @@ protected void serviceInit(Configuration conf) throws Exception { 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 = -- 2.14.3 (Apple Git-98)