diff --git a/hcatalog/webhcat/svr/src/main/config/webhcat-default.xml b/hcatalog/webhcat/svr/src/main/config/webhcat-default.xml index a27419a..10ea923 100644 --- a/hcatalog/webhcat/svr/src/main/config/webhcat-default.xml +++ b/hcatalog/webhcat/svr/src/main/config/webhcat-default.xml @@ -226,6 +226,33 @@ + templeton.controller.map.mem + 512 + + The value of mapreduce.map.memory.mb for templeton controller job, + used by hadoop 2.0 + + + + + templeton.controller.am.mem + 512 + + The value of yarn.app.mapreduce.am.resource.mb for templeton controller job, + used by hadoop 2.0 + + + + + templeton.controller.am.java.opts + -Xmx300m + + The value of yarn.app.mapreduce.am.command-opts for templeton controller job, + used by hadoop 2.0 + + + + templeton.hadoop.queue.name default diff --git a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/AppConfig.java b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/AppConfig.java index 5f5ee54..140063f 100644 --- a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/AppConfig.java +++ b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/AppConfig.java @@ -97,8 +97,11 @@ 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 CONTROLLER_MAP_JAVA_OPTS + = "templeton.controller.mr.child.opts"; + public static final String CONTROLLER_MAP_MEMORY = "templeton.controller.map.mem"; + public static final String CONTROLLER_MAP_AM_MEMORY = "templeton.controller.am.mem"; + public static final String CONTROLLER_MAP_AM_JAVA_OPTS = "templeton.controller.am.java.opts"; public static final String KERBEROS_SECRET = "templeton.kerberos.secret"; public static final String KERBEROS_PRINCIPAL = "templeton.kerberos.principal"; @@ -116,6 +119,14 @@ public static final String HADOOP_SPECULATIVE_NAME = "mapred.map.tasks.speculative.execution"; public static final String HADOOP_CHILD_JAVA_OPTS = "mapred.child.java.opts"; + + //hadoop 2.0 params + public static final String HADOOP_MAP_JAVA_OPTS = "mapreduce.map.java.opts"; + public static final String HADOOP_MAP_MEMORY = "mapreduce.map.memory.mb"; + public static final String HADOOP_AM_MEMORY = "yarn.app.mapreduce.am.resource.mb"; + public static final String HADOOP_AM_JAVA_OPTS = "yarn.app.mapreduce.am.command-opts"; + + public static final String UNIT_TEST_MODE = "templeton.unit.test.mode"; @@ -189,9 +200,10 @@ private boolean loadOneClasspathConfig(String fname) { 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 controllerMRChildOpts() { return get(CONTROLLER_MAP_JAVA_OPTS); } + public String controllerMapMem() { return get(CONTROLLER_MAP_MEMORY); } + public String controllerAMMem() { return get(CONTROLLER_MAP_AM_MEMORY); } + public String controllerAMMJavaOpts() { return get(CONTROLLER_MAP_AM_JAVA_OPTS); } diff --git a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/LauncherDelegator.java b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/LauncherDelegator.java index 75d57eb..2b819eb 100644 --- a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/LauncherDelegator.java +++ b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/LauncherDelegator.java @@ -116,6 +116,12 @@ public String run() throws Exception { addDef(args, "user.name", runAs); addDef(args, AppConfig.HADOOP_SPECULATIVE_NAME, "false"); addDef(args, AppConfig.HADOOP_CHILD_JAVA_OPTS, appConf.controllerMRChildOpts()); + + //Hadoop 2.0 config params + addDef(args, AppConfig.HADOOP_MAP_JAVA_OPTS, appConf.controllerMRChildOpts()); + addDef(args, AppConfig.HADOOP_MAP_MEMORY, appConf.controllerMapMem()); + addDef(args, AppConfig.HADOOP_AM_MEMORY, appConf.controllerAMMem()); + addDef(args, AppConfig.HADOOP_AM_JAVA_OPTS, appConf.controllerAMMJavaOpts()); // Internal vars addDef(args, TempletonControllerJob.STATUSDIR_NAME, statusdir);