diff --git src/docs/src/documentation/content/xdocs/configuration.xml src/docs/src/documentation/content/xdocs/configuration.xml index 28817bd..0345992 100644 --- src/docs/src/documentation/content/xdocs/configuration.xml +++ src/docs/src/documentation/content/xdocs/configuration.xml @@ -188,6 +188,12 @@ hive.metastore.sasl.enabled=false + templeton.controller.mr.child.opts + -server -Xmx256m -Djava.net.preferIPv4Stack=true + Java options to be passed to templeton controller map task. + + + templeton.exec.envs HADOOP_PREFIX,HADOOP_HOME,JAVA_HOME The environment variables passed through to exec. diff --git webhcat/svr/src/main/config/webhcat-default.xml webhcat/svr/src/main/config/webhcat-default.xml index a06e8f8..9d6e587 100644 --- webhcat/svr/src/main/config/webhcat-default.xml +++ webhcat/svr/src/main/config/webhcat-default.xml @@ -145,6 +145,21 @@ + templeton.controller.mr.child.opts + -server -Xmx256m -Djava.net.preferIPv4Stack=true + Java options to be passed to templeton controller map task. + The default value of mapreduce child "-Xmx" (heap memory limit) + might be close to what is allowed for a map task. + Even if templeton controller map task does not need much + memory, the jvm (with -server option?) + allocates the max memory when it starts. This along with the + memory used by pig/hive client it starts can end up exceeding + the max memory configured to be allowed for a map task + Use this option to set -Xmx to lower value + + + + templeton.exec.envs HADOOP_PREFIX,HADOOP_HOME,JAVA_HOME The environment variables passed through to exec. diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/AppConfig.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/AppConfig.java index e74c39d..bd90f43 100644 --- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/AppConfig.java +++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/AppConfig.java @@ -21,6 +21,7 @@ package org.apache.hcatalog.templeton; import java.io.File; import java.net.URL; import java.util.Map; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; @@ -95,6 +96,9 @@ public class AppConfig extends Configuration { public static final String TEMPLETON_JAR_NAME = "templeton.jar"; public static final String OVERRIDE_JARS_NAME = "templeton.override.jars"; public static final String OVERRIDE_JARS_ENABLED = "templeton.override.enabled"; + public static final String TEMPLETON_CONTROLLER_MR_CHILD_OPTS + = "templeton.controller.mr.child.opts"; + public static final String KERBEROS_SECRET = "templeton.kerberos.secret"; public static final String KERBEROS_PRINCIPAL = "templeton.kerberos.principal"; public static final String KERBEROS_KEYTAB = "templeton.kerberos.keytab"; @@ -103,12 +107,16 @@ public class AppConfig extends Configuration { = "templeton.callback.retry.interval"; public static final String CALLBACK_RETRY_NAME = "templeton.callback.retry.attempts"; + + //Hadoop property names (set by templeton logic) public static final String HADOOP_END_INTERVAL_NAME = "job.end.retry.interval"; public static final String HADOOP_END_RETRY_NAME = "job.end.retry.attempts"; public static final String HADOOP_END_URL_NAME = "job.end.notification.url"; public static final String HADOOP_SPECULATIVE_NAME = "mapred.map.tasks.speculative.execution"; + public static final String HADOOP_CHILD_JAVA_OPTS = "mapred.child.java.opts"; + private static final Log LOG = LogFactory.getLog(AppConfig.class); public AppConfig() { @@ -177,7 +185,12 @@ public class AppConfig extends Configuration { public String kerberosSecret() { return get(KERBEROS_SECRET); } public String kerberosPrincipal(){ return get(KERBEROS_PRINCIPAL); } public String kerberosKeytab() { return get(KERBEROS_KEYTAB); } + public String controllerMRChildOpts() { + return get(TEMPLETON_CONTROLLER_MR_CHILD_OPTS); + } + + public String[] overrideJars() { if (getBoolean(OVERRIDE_JARS_ENABLED, true)) return getStrings(OVERRIDE_JARS_NAME); diff --git webhcat/svr/src/main/java/org/apache/hcatalog/templeton/LauncherDelegator.java webhcat/svr/src/main/java/org/apache/hcatalog/templeton/LauncherDelegator.java index 9830c4d..f170475 100644 --- webhcat/svr/src/main/java/org/apache/hcatalog/templeton/LauncherDelegator.java +++ webhcat/svr/src/main/java/org/apache/hcatalog/templeton/LauncherDelegator.java @@ -116,6 +116,7 @@ public class LauncherDelegator extends TempletonDelegator { // Hadoop vars addDef(args, "user.name", runAs); addDef(args, AppConfig.HADOOP_SPECULATIVE_NAME, "false"); + addDef(args, AppConfig.HADOOP_CHILD_JAVA_OPTS, appConf.controllerMRChildOpts()); // Internal vars addDef(args, TempletonControllerJob.STATUSDIR_NAME, statusdir);