From 6a76c73fd3240bb39f904c24b7f995412f4a7226 Mon Sep 17 00:00:00 2001 From: Sunil G Date: Thu, 22 Mar 2018 16:27:28 +0530 Subject: [PATCH] YARN-8062 --- .../org/apache/hadoop/yarn/server/resourcemanager/AdminService.java | 4 ++-- .../apache/hadoop/yarn/server/resourcemanager/ResourceManager.java | 3 +-- 2 files changed, 3 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/AdminService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java index 3c117bc4b07..74abd577d05 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java @@ -523,9 +523,9 @@ public RefreshUserToGroupsMappingsResponse refreshUserToGroupsMappings( } private void refreshUserToGroupsMappings() throws IOException, YarnException { - Groups.getUserToGroupsMappingService( + Groups.getUserToGroupsMappingServiceWithLoadedConfiguration( getConfiguration(new Configuration(false), - YarnConfiguration.CORE_SITE_CONFIGURATION_FILE)).refresh(); + YarnConfiguration.CORE_SITE_CONFIGURATION_FILE)); } @Override 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..dfd1511098b 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 @@ -261,8 +261,7 @@ protected void serviceInit(Configuration conf) throws Exception { loadConfigurationXml(YarnConfiguration.CORE_SITE_CONFIGURATION_FILE); // Do refreshUserToGroupsMappings with loaded core-site.xml - Groups.getUserToGroupsMappingServiceWithLoadedConfiguration(this.conf) - .refresh(); + Groups.getUserToGroupsMappingService(this.conf).refresh(); // Do refreshSuperUserGroupsConfiguration with loaded core-site.xml // Or use RM specific configurations to overwrite the common ones first -- 2.14.3 (Apple Git-98)