Index: hcatalog/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/AppConfig.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- hcatalog/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/AppConfig.java (revision d563db5e363ece1a382041fc08be2511644faecd)
+++ hcatalog/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/AppConfig.java (revision )
@@ -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 @@
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); }
Index: hcatalog/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/LauncherDelegator.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- hcatalog/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/LauncherDelegator.java (revision d563db5e363ece1a382041fc08be2511644faecd)
+++ hcatalog/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/LauncherDelegator.java (revision )
@@ -125,6 +125,9 @@
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);
Index: hcatalog/webhcat/svr/src/main/config/webhcat-default.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- hcatalog/webhcat/svr/src/main/config/webhcat-default.xml (revision d563db5e363ece1a382041fc08be2511644faecd)
+++ hcatalog/webhcat/svr/src/main/config/webhcat-default.xml (revision )
@@ -225,4 +225,14 @@
The maximum age of a templeton job
+
+ templeton.hadoop.queue.name
+
+
+ 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.
+
+
+