Repository: hadoop Updated Branches: refs/heads/trunk 18844599a -> 53b3e5947
YARN-7936. Add default service AM Xmx. Contributed by Jian He Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/53b3e594 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/53b3e594 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/53b3e594 Branch: refs/heads/trunk Commit: 53b3e594732e7a567dda4e08b9a8af5f87a4472a Parents: 1884459 Author: Billie Rinaldi <bil...@apache.org> Authored: Thu Apr 12 11:35:14 2018 -0700 Committer: Billie Rinaldi <bil...@apache.org> Committed: Thu Apr 12 12:38:00 2018 -0700 ---------------------------------------------------------------------- .../apache/hadoop/yarn/service/client/ServiceClient.java | 9 +++++++-- .../apache/hadoop/yarn/service/conf/YarnServiceConf.java | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/53b3e594/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/client/ServiceClient.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/client/ServiceClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/client/ServiceClient.java index 4c7b72d..21fb075 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/client/ServiceClient.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/client/ServiceClient.java @@ -758,8 +758,13 @@ public class ServiceClient extends AppAdminClient implements SliderExitCodes, Path appRootDir, boolean hasSliderAMLog4j) throws BadConfigException { JavaCommandLineBuilder CLI = new JavaCommandLineBuilder(); CLI.forceIPv4().headless(); - CLI.setJVMOpts(YarnServiceConf.get(YarnServiceConf.JVM_OPTS, null, - app.getConfiguration(), conf)); + String jvmOpts = YarnServiceConf + .get(YarnServiceConf.JVM_OPTS, "", app.getConfiguration(), conf); + if (!jvmOpts.contains("-Xmx")) { + jvmOpts += DEFAULT_AM_JVM_XMX; + } + + CLI.setJVMOpts(jvmOpts); if (hasSliderAMLog4j) { CLI.sysprop(SYSPROP_LOG4J_CONFIGURATION, YARN_SERVICE_LOG4J_FILENAME); CLI.sysprop(SYSPROP_LOG_DIR, ApplicationConstants.LOG_DIR_EXPANSION_VAR); http://git-wip-us.apache.org/repos/asf/hadoop/blob/53b3e594/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/conf/YarnServiceConf.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/conf/YarnServiceConf.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/conf/YarnServiceConf.java index 14c4d15..3dd5a7e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/conf/YarnServiceConf.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/conf/YarnServiceConf.java @@ -38,6 +38,8 @@ public class YarnServiceConf { public static final String AM_RESOURCE_MEM = "yarn.service.am-resource.memory"; public static final long DEFAULT_KEY_AM_RESOURCE_MEM = 1024; + public static final String DEFAULT_AM_JVM_XMX = " -Xmx768m "; + public static final String YARN_QUEUE = "yarn.service.queue"; public static final String API_SERVER_ADDRESS = "yarn.service.api-server.address"; --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
