You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by gu...@apache.org on 2014/10/09 01:19:27 UTC
svn commit: r1630253 - in
/hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/exec:
mr/ExecDriver.java tez/TezSessionState.java
Author: gunther
Date: Wed Oct 8 23:19:26 2014
New Revision: 1630253
URL: http://svn.apache.org/r1630253
Log:
HIVE-8344: Hive on Tez sets mapreduce.framework.name to yarn-tez (Gunther Hagleitner, reviewed by Vikram Dixit K)
Modified:
hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java
hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionState.java
Modified: hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java?rev=1630253&r1=1630252&r2=1630253&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java (original)
+++ hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java Wed Oct 8 23:19:26 2014
@@ -56,6 +56,8 @@ import org.apache.hadoop.hive.ql.exec.Pa
import org.apache.hadoop.hive.ql.exec.TableScanOperator;
import org.apache.hadoop.hive.ql.exec.Task;
import org.apache.hadoop.hive.ql.exec.Utilities;
+import org.apache.hadoop.hive.ql.exec.tez.TezSessionState;
+import org.apache.hadoop.hive.ql.exec.tez.TezSessionPoolManager;
import org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat;
import org.apache.hadoop.hive.ql.io.HiveKey;
import org.apache.hadoop.hive.ql.io.HiveOutputFormatImpl;
@@ -416,6 +418,13 @@ public class ExecDriver extends Task<Map
Utilities.createTmpDirs(job, mWork);
Utilities.createTmpDirs(job, rWork);
+ SessionState ss = SessionState.get();
+ if (HiveConf.getVar(job, HiveConf.ConfVars.HIVE_EXECUTION_ENGINE).equals("tez")
+ && ss != null) {
+ TezSessionState session = ss.getTezSession();
+ TezSessionPoolManager.getInstance().close(session, true);
+ }
+
// Finally SUBMIT the JOB!
rj = jc.submitJob(job);
// replace it back
Modified: hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionState.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionState.java?rev=1630253&r1=1630252&r2=1630253&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionState.java (original)
+++ hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionState.java Wed Oct 8 23:19:26 2014
@@ -207,11 +207,6 @@ public class TezSessionState {
} catch(InterruptedException ie) {
//ignore
}
- // In case we need to run some MR jobs, we'll run them under tez MR emulation. The session
- // id is used for tez to reuse the current session rather than start a new one.
- conf.set("mapreduce.framework.name", "yarn-tez");
- conf.set("mapreduce.tez.session.tokill-application-id",
- session.getAppMasterApplicationId().toString());
openSessions.add(this);
}