Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id EEE37200C7C for ; Mon, 5 Jun 2017 22:31:04 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id ED735160BBB; Mon, 5 Jun 2017 20:31:04 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 40881160BE4 for ; Mon, 5 Jun 2017 22:31:04 +0200 (CEST) Received: (qmail 57937 invoked by uid 500); 5 Jun 2017 20:30:52 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 55854 invoked by uid 99); 5 Jun 2017 20:30:51 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Jun 2017 20:30:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 41EC1DFF9F; Mon, 5 Jun 2017 20:30:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: xgong@apache.org To: common-commits@hadoop.apache.org Date: Mon, 05 Jun 2017 20:31:15 -0000 Message-Id: In-Reply-To: <86778c1e317047419dcc958a8dc6571f@git.apache.org> References: <86778c1e317047419dcc958a8dc6571f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: =?utf-8?q?=5B26/50=5D_=5Babbrv=5D_hadoop_git_commit=3A_YARN-6497?= =?utf-8?q?=2E_Method_length_of_ResourceManager=23serviceInit=28=29_is_too_l?= =?utf-8?q?ong_=28Gergely_Nov=C3=A1k_via_jeagles=29?= archived-at: Mon, 05 Jun 2017 20:31:05 -0000 YARN-6497. Method length of ResourceManager#serviceInit() is too long (Gergely Novák via jeagles) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2279bdf8 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2279bdf8 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2279bdf8 Branch: refs/heads/YARN-5734 Commit: 2279bdf87b546036406a684cddeae6cebee97c76 Parents: 22f831b Author: Jonathan Eagles Authored: Wed May 31 10:18:09 2017 -0500 Committer: Xuan Committed: Mon Jun 5 13:29:38 2017 -0700 ---------------------------------------------------------------------- .../server/resourcemanager/ResourceManager.java | 27 ++++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/2279bdf8/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 8f2c121..f727f55 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 @@ -59,6 +59,7 @@ import org.apache.hadoop.yarn.event.AsyncDispatcher; import org.apache.hadoop.yarn.event.Dispatcher; import org.apache.hadoop.yarn.event.EventDispatcher; 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.server.resourcemanager.ahs.RMApplicationHistoryWriter; import org.apache.hadoop.yarn.server.resourcemanager.amlauncher.AMLauncherEventType; @@ -238,13 +239,7 @@ public class ResourceManager extends CompositeService implements Recoverable { rmContext.setConfigurationProvider(configurationProvider); // load core-site.xml - InputStream coreSiteXMLInputStream = - this.configurationProvider.getConfigurationInputStream(this.conf, - YarnConfiguration.CORE_SITE_CONFIGURATION_FILE); - if (coreSiteXMLInputStream != null) { - this.conf.addResource(coreSiteXMLInputStream, - YarnConfiguration.CORE_SITE_CONFIGURATION_FILE); - } + loadConfigurationXml(YarnConfiguration.CORE_SITE_CONFIGURATION_FILE); // Do refreshUserToGroupsMappings with loaded core-site.xml Groups.getUserToGroupsMappingServiceWithLoadedConfiguration(this.conf) @@ -257,13 +252,7 @@ public class ResourceManager extends CompositeService implements Recoverable { ProxyUsers.refreshSuperUserGroupsConfiguration(this.conf); // load yarn-site.xml - InputStream yarnSiteXMLInputStream = - this.configurationProvider.getConfigurationInputStream(this.conf, - YarnConfiguration.YARN_SITE_CONFIGURATION_FILE); - if (yarnSiteXMLInputStream != null) { - this.conf.addResource(yarnSiteXMLInputStream, - YarnConfiguration.YARN_SITE_CONFIGURATION_FILE); - } + loadConfigurationXml(YarnConfiguration.YARN_SITE_CONFIGURATION_FILE); validateConfigs(this.conf); @@ -339,6 +328,16 @@ public class ResourceManager extends CompositeService implements Recoverable { 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 { EmbeddedElector elector; curatorEnabled = --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org