HIVE-8794: Hive on Tez leaks AMs when killed before first dag is run …

…(Gunther Hagleitner, reviewed by Gopal V) git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1637600 13f79535-47bb-0310-9956-ffa450edef68
akitanaka · Nov 8, 2014 · 621ea88 · 621ea88
1 parent d543484
commit 621ea88
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezJobMonitor.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezJobMonitor.java
@@ -45,6 +45,8 @@
 import org.apache.tez.dag.api.client.VertexStatus;
 import org.fusesource.jansi.Ansi;
 
+import com.google.common.base.Preconditions;
+
 import java.io.IOException;
 import java.io.PrintStream;
 import java.text.DecimalFormat;
@@ -132,6 +134,11 @@ public void run() {
     });
   }
 
+  public static void initShutdownHook() {
+    Preconditions.checkNotNull(shutdownList,
+        "Shutdown hook was not properly initialized");
+  }
+
   public TezJobMonitor() {
     console = SessionState.getConsole();
     secondsFormat = new DecimalFormat("#0.00");

diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionState.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionState.java
@@ -187,6 +187,7 @@ public void open(HiveConf conf, String[] additionalFiles)
     LOG.info("Opening new Tez Session (id: " + sessionId
         + ", scratch dir: " + tezScratchDir + ")");
 
+    TezJobMonitor.initShutdownHook();
     session.start();
 
     if (HiveConf.getBoolVar(conf, ConfVars.HIVE_PREWARM_ENABLED)) {