diff --git a/data/conf/llap/hive-site.xml b/data/conf/llap/hive-site.xml
index c002b1e..0e8c7c1 100644
--- a/data/conf/llap/hive-site.xml
+++ b/data/conf/llap/hive-site.xml
@@ -39,16 +39,6 @@
- hive.execution.mode
- container
-
-
-
- mapred.tez.java.opts
- -Xmx128m
-
-
-
hive.tez.container.size
128
diff --git a/data/conf/tez/hive-site.xml b/data/conf/tez/hive-site.xml
index b4abe90..8acf270 100644
--- a/data/conf/tez/hive-site.xml
+++ b/data/conf/tez/hive-site.xml
@@ -39,11 +39,6 @@
- mapred.tez.java.opts
- -Xmx128m
-
-
-
hive.tez.container.size
128
diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/TestLocationQueries.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/TestLocationQueries.java
index 1fe4f48..6ee98cb 100644
--- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/TestLocationQueries.java
+++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/TestLocationQueries.java
@@ -88,7 +88,7 @@ public CheckResults(String outDir, String logDir, MiniClusterType miniMr,
String hadoopVer, String locationSubdir)
throws Exception
{
- super(outDir, logDir, miniMr, null, hadoopVer, "", "", false);
+ super(outDir, logDir, miniMr, null, hadoopVer, "", "");
this.locationSubdir = locationSubdir;
}
}
diff --git a/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java b/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
index 68141ea..0d74d7f 100644
--- a/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
+++ b/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
@@ -347,15 +347,8 @@ private String getKeyProviderURI() {
}
public QTestUtil(String outDir, String logDir, MiniClusterType clusterType,
- String confDir, String hadoopVer, String initScript,
- String cleanupScript) throws Exception {
- this(outDir, logDir, clusterType, confDir,
- hadoopVer, initScript, cleanupScript, true);
- }
-
- public QTestUtil(String outDir, String logDir, MiniClusterType clusterType,
String confDir, String hadoopVer, String initScript,
- String cleanupScript, boolean withLlapIo) throws Exception {
+ String cleanupScript) throws Exception {
this.outDir = outDir;
this.logDir = logDir;
@@ -446,7 +439,7 @@ public void shutdown() throws Exception {
cleanUp();
}
- if (clusterType == MiniClusterType.tez) {
+ if (clusterType == MiniClusterType.tez || clusterType == MiniClusterType.llap) {
SessionState.get().getTezSession().close(false);
}
setup.tearDown();
@@ -912,8 +905,8 @@ public String cliInit(String tname, boolean recreate) throws Exception {
ss.setIsSilent(true);
SessionState oldSs = SessionState.get();
- if (oldSs != null && (clusterType == MiniClusterType.tez || clusterType == MiniClusterType.spark
- || clusterType == MiniClusterType.miniSparkOnYarn)) {
+ if (oldSs != null && (clusterType == MiniClusterType.tez || clusterType == MiniClusterType.llap
+ || clusterType == MiniClusterType.spark || clusterType == MiniClusterType.miniSparkOnYarn)) {
sparkSession = oldSs.getSparkSession();
ss.setSparkSession(sparkSession);
oldSs.setSparkSession(null);
@@ -976,8 +969,8 @@ private CliSessionState startSessionState()
ss.err = System.out;
SessionState oldSs = SessionState.get();
- if (oldSs != null && (clusterType == MiniClusterType.tez || clusterType == MiniClusterType.spark
- || clusterType == MiniClusterType.miniSparkOnYarn)) {
+ if (oldSs != null && (clusterType == MiniClusterType.tez || clusterType == MiniClusterType.llap
+ || clusterType == MiniClusterType.miniSparkOnYarn || clusterType == MiniClusterType.miniSparkOnYarn)) {
sparkSession = oldSs.getSparkSession();
ss.setSparkSession(sparkSession);
oldSs.setSparkSession(null);
@@ -1838,7 +1831,7 @@ public void run() {
QTestUtil[] qt = new QTestUtil[qfiles.length];
for (int i = 0; i < qfiles.length; i++) {
qt[i] = new QTestUtil(resDir, logDir, MiniClusterType.none, null, "0.20",
- defaultInitScript, defaultCleanupScript, false);
+ defaultInitScript, defaultCleanupScript);
qt[i].addFile(qfiles[i]);
qt[i].clearTestSideEffects();
}
diff --git a/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java b/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
index e650cfd..876754d 100644
--- a/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
+++ b/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
@@ -390,11 +390,6 @@ public MiniMrShim getMiniTezCluster(Configuration conf, int numberOfTaskTrackers
public MiniTezShim(Configuration conf, int numberOfTaskTrackers, String nameNode,
boolean isLlap) throws IOException {
- if (isLlap) {
- createAndLaunchLlapDaemon(conf);
- } else {
- miniLlapCluster = null;
- }
mr = new MiniTezCluster("hive", numberOfTaskTrackers);
conf.set("fs.defaultFS", nameNode);
conf.set("tez.am.log.level", "DEBUG");
@@ -402,6 +397,11 @@ public MiniTezShim(Configuration conf, int numberOfTaskTrackers, String nameNode
mr.init(conf);
mr.start();
this.conf = mr.getConfig();
+ if (isLlap) {
+ createAndLaunchLlapDaemon(this.conf);
+ } else {
+ miniLlapCluster = null;
+ }
}
private void createAndLaunchLlapDaemon(final Configuration conf) {