HIVE-10611: Mini tez tests wait for 5 minutes before shutting down (Vikram Dixit K, reviewed by Ashutosh Chauhan)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/632a3090 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/632a3090 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/632a3090 Branch: refs/heads/beeline-cli Commit: 632a30908d4680c0ee31ba04e4cfc9da3554e4f5 Parents: 18fb460 Author: vikram <vik...@hortonworks.com> Authored: Wed May 6 14:28:23 2015 -0700 Committer: vikram <vik...@hortonworks.com> Committed: Wed May 6 14:30:14 2015 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/hive/ql/QTestUtil.java | 3 +++ .../hadoop/hive/ql/exec/tez/TezSessionState.java | 13 +++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/632a3090/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java ---------------------------------------------------------------------- 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 d1104b3..3e29d3c 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 @@ -430,6 +430,9 @@ public class QTestUtil { cleanUp(); } + if (clusterType == MiniClusterType.tez) { + SessionState.get().getTezSession().close(false); + } setup.tearDown(); if (sparkSession != null) { try { http://git-wip-us.apache.org/repos/asf/hive/blob/632a3090/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionState.java ---------------------------------------------------------------------- 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 index 89286e5..cef3303 100644 --- 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 @@ -249,13 +249,14 @@ public class TezSessionState { } /** - * Close a tez session. Will cleanup any tez/am related resources. After closing a session - * no further DAGs can be executed against it. - * @param keepTmpDir whether or not to remove the scratch dir at the same time. - * @throws IOException - * @throws TezException + * Close a tez session. Will cleanup any tez/am related resources. After closing a session no + * further DAGs can be executed against it. + * + * @param keepTmpDir + * whether or not to remove the scratch dir at the same time. + * @throws Exception */ - public void close(boolean keepTmpDir) throws TezException, IOException { + public void close(boolean keepTmpDir) throws Exception { if (!isOpen()) { return; }
