Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-6497. Method length of ResourceManager#serviceInit() is too long (Gergely Novák via jeagles)

This commit is contained in:
Jonathan Eagles 2017-05-31 10:18:09 -05:00
parent 13de636b40
commit cbfed0e82f
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
View File

@ -59,6 +59,7 @@ import org.apache.hadoop.yarn.event.AsyncDispatcher;
import org.apache.hadoop.yarn.event.Dispatcher; import org.apache.hadoop.yarn.event.Dispatcher;
import org.apache.hadoop.yarn.event.EventDispatcher; import org.apache.hadoop.yarn.event.EventDispatcher;
import org.apache.hadoop.yarn.event.EventHandler; import org.apache.hadoop.yarn.event.EventHandler;
import org.apache.hadoop.yarn.exceptions.YarnException;
import org.apache.hadoop.yarn.exceptions.YarnRuntimeException; import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
import org.apache.hadoop.yarn.server.resourcemanager.ahs.RMApplicationHistoryWriter; import org.apache.hadoop.yarn.server.resourcemanager.ahs.RMApplicationHistoryWriter;
import org.apache.hadoop.yarn.server.resourcemanager.amlauncher.AMLauncherEventType; import org.apache.hadoop.yarn.server.resourcemanager.amlauncher.AMLauncherEventType;
@ -238,13 +239,7 @@ public class ResourceManager extends CompositeService implements Recoverable {
rmContext.setConfigurationProvider(configurationProvider); rmContext.setConfigurationProvider(configurationProvider);
// load core-site.xml // load core-site.xml
InputStream coreSiteXMLInputStream = loadConfigurationXml(YarnConfiguration.CORE_SITE_CONFIGURATION_FILE);
this.configurationProvider.getConfigurationInputStream(this.conf,
YarnConfiguration.CORE_SITE_CONFIGURATION_FILE);
if (coreSiteXMLInputStream != null) {
this.conf.addResource(coreSiteXMLInputStream,
YarnConfiguration.CORE_SITE_CONFIGURATION_FILE);
}
// Do refreshUserToGroupsMappings with loaded core-site.xml // Do refreshUserToGroupsMappings with loaded core-site.xml
Groups.getUserToGroupsMappingServiceWithLoadedConfiguration(this.conf) Groups.getUserToGroupsMappingServiceWithLoadedConfiguration(this.conf)
@ -257,13 +252,7 @@ public class ResourceManager extends CompositeService implements Recoverable {
ProxyUsers.refreshSuperUserGroupsConfiguration(this.conf); ProxyUsers.refreshSuperUserGroupsConfiguration(this.conf);
// load yarn-site.xml // load yarn-site.xml
InputStream yarnSiteXMLInputStream = loadConfigurationXml(YarnConfiguration.YARN_SITE_CONFIGURATION_FILE);
this.configurationProvider.getConfigurationInputStream(this.conf,
YarnConfiguration.YARN_SITE_CONFIGURATION_FILE);
if (yarnSiteXMLInputStream != null) {
this.conf.addResource(yarnSiteXMLInputStream,
YarnConfiguration.YARN_SITE_CONFIGURATION_FILE);
}
validateConfigs(this.conf); validateConfigs(this.conf);
@ -339,6 +328,16 @@ public class ResourceManager extends CompositeService implements Recoverable {
super.serviceInit(this.conf); super.serviceInit(this.conf);
} }
private void loadConfigurationXml(String configurationFile)
throws YarnException, IOException {
InputStream configurationInputStream =
this.configurationProvider.getConfigurationInputStream(this.conf,
configurationFile);
if (configurationInputStream != null) {
this.conf.addResource(configurationInputStream, configurationFile);
}
}
protected EmbeddedElector createEmbeddedElector() throws IOException { protected EmbeddedElector createEmbeddedElector() throws IOException {
EmbeddedElector elector; EmbeddedElector elector;
curatorEnabled = curatorEnabled =