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 5d381570f8
)
This commit is contained in:
parent
b8e82a4f66
commit
a465026207
|
@ -240,9 +240,8 @@ public class ResourceManager extends CompositeService implements Recoverable {
|
||||||
// load core-site.xml
|
// load core-site.xml
|
||||||
loadConfigurationXml(YarnConfiguration.CORE_SITE_CONFIGURATION_FILE);
|
loadConfigurationXml(YarnConfiguration.CORE_SITE_CONFIGURATION_FILE);
|
||||||
|
|
||||||
// Do refreshUserToGroupsMappings with loaded core-site.xml
|
// Refresh user to group mappings during init.
|
||||||
Groups.getUserToGroupsMappingServiceWithLoadedConfiguration(this.conf)
|
refreshUserToGroupMappingsWithConf();
|
||||||
.refresh();
|
|
||||||
|
|
||||||
// Do refreshSuperUserGroupsConfiguration with loaded core-site.xml
|
// Do refreshSuperUserGroupsConfiguration with loaded core-site.xml
|
||||||
// Or use RM specific configurations to overwrite the common ones first
|
// Or use RM specific configurations to overwrite the common ones first
|
||||||
|
@ -327,6 +326,21 @@ public class ResourceManager extends CompositeService implements Recoverable {
|
||||||
super.serviceInit(this.conf);
|
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)
|
private void loadConfigurationXml(String configurationFile)
|
||||||
throws YarnException, IOException {
|
throws YarnException, IOException {
|
||||||
InputStream configurationInputStream =
|
InputStream configurationInputStream =
|
||||||
|
|
Loading…
Reference in New Issue