Return-Path: X-Original-To: apmail-hive-commits-archive@www.apache.org Delivered-To: apmail-hive-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 632771787D for ; Sat, 8 Nov 2014 22:24:31 +0000 (UTC) Received: (qmail 87661 invoked by uid 500); 8 Nov 2014 22:24:31 -0000 Delivered-To: apmail-hive-commits-archive@hive.apache.org Received: (qmail 87621 invoked by uid 500); 8 Nov 2014 22:24:31 -0000 Mailing-List: contact commits-help@hive.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hive-dev@hive.apache.org Delivered-To: mailing list commits@hive.apache.org Received: (qmail 87610 invoked by uid 99); 8 Nov 2014 22:24:31 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 08 Nov 2014 22:24:31 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 08 Nov 2014 22:24:30 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 142E12388993; Sat, 8 Nov 2014 22:24:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1637601 - in /hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/exec/tez: TezJobMonitor.java TezSessionState.java Date: Sat, 08 Nov 2014 22:24:09 -0000 To: commits@hive.apache.org From: gunther@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20141108222410.142E12388993@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gunther Date: Sat Nov 8 22:24:09 2014 New Revision: 1637601 URL: http://svn.apache.org/r1637601 Log: HIVE-8794: Hive on Tez leaks AMs when killed before first dag is run (Gunther Hagleitner, reviewed by Gopal V) Modified: hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezJobMonitor.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/tez/TezJobMonitor.java URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezJobMonitor.java?rev=1637601&r1=1637600&r2=1637601&view=diff ============================================================================== --- hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezJobMonitor.java (original) +++ hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezJobMonitor.java Sat Nov 8 22:24:09 2014 @@ -45,6 +45,8 @@ import org.apache.tez.dag.api.client.Sta 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 class TezJobMonitor { }); } + public static void initShutdownHook() { + Preconditions.checkNotNull(shutdownList, + "Shutdown hook was not properly initialized"); + } + public TezJobMonitor() { console = SessionState.getConsole(); secondsFormat = new DecimalFormat("#0.00"); 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=1637601&r1=1637600&r2=1637601&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 Sat Nov 8 22:24:09 2014 @@ -187,6 +187,7 @@ public class TezSessionState { LOG.info("Opening new Tez Session (id: " + sessionId + ", scratch dir: " + tezScratchDir + ")"); + TezJobMonitor.initShutdownHook(); session.start(); if (HiveConf.getBoolVar(conf, ConfVars.HIVE_PREWARM_ENABLED)) {