diff --git hcatalog/webhcat/svr/src/main/config/webhcat-default.xml hcatalog/webhcat/svr/src/main/config/webhcat-default.xml index 7f3e66b..d00f728 100644 --- hcatalog/webhcat/svr/src/main/config/webhcat-default.xml +++ hcatalog/webhcat/svr/src/main/config/webhcat-default.xml @@ -225,4 +225,14 @@ The maximum age of a templeton job + + templeton.hadoop.queue.name + default + + MapReduce queue name where WebHCat map-only jobs will be + submitted to. Can be used to avoid a deadlock where all map slots + in the cluster are taken over by Templeton launcher tasks. + + + diff --git hcatalog/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/AppConfig.java hcatalog/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/AppConfig.java index 87bdd66..7bf9ede 100644 --- hcatalog/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/AppConfig.java +++ hcatalog/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/AppConfig.java @@ -83,6 +83,7 @@ public static final String EXEC_MAX_BYTES_NAME = "templeton.exec.max-output-bytes"; public static final String EXEC_MAX_PROCS_NAME = "templeton.exec.max-procs"; public static final String EXEC_TIMEOUT_NAME = "templeton.exec.timeout"; + public static final String HADOOP_QUEUE_NAME = "templeton.hadoop.queue.name"; public static final String HADOOP_NAME = "templeton.hadoop"; public static final String HADOOP_CONF_DIR = "templeton.hadoop.conf.dir"; public static final String HCAT_NAME = "templeton.hcat"; @@ -175,6 +176,7 @@ private boolean loadOneClasspathConfig(String fname) { public String templetonJar() { return get(TEMPLETON_JAR_NAME); } public String libJars() { return get(LIB_JARS_NAME); } + public String hadoopQueueName() { return get(HADOOP_QUEUE_NAME); } public String clusterHadoop() { return get(HADOOP_NAME); } public String clusterHcat() { return get(HCAT_NAME); } public String pigPath() { return get(PIG_PATH_NAME); } diff --git hcatalog/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/LauncherDelegator.java hcatalog/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/LauncherDelegator.java index f170475..cb89409 100644 --- hcatalog/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/LauncherDelegator.java +++ hcatalog/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/LauncherDelegator.java @@ -125,6 +125,9 @@ public String run() throws Exception { addDef(args, TempletonControllerJob.OVERRIDE_CLASSPATH, makeOverrideClasspath(appConf)); + // Hadoop queue information + addDef(args, "mapred.job.queue.name", appConf.hadoopQueueName()); + // Job vars addStorageVars(args); addCompletionVars(args, completedUrl);