You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by lp...@apache.org on 2020/10/28 07:44:25 UTC
[hive] branch master updated: HIVE-24294: TezSessionPool sessions
can throw AssertionError (#1596) (Naresh Panchetty Ramanaiah,
reviewed by Mustafa Iman, Laszlo Pinter)
This is an automated email from the ASF dual-hosted git repository.
lpinter pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new 78840c2 HIVE-24294: TezSessionPool sessions can throw AssertionError (#1596) (Naresh Panchetty Ramanaiah, reviewed by Mustafa Iman, Laszlo Pinter)
78840c2 is described below
commit 78840c2cb941e8c87bf608ff2beedc8107b6dcaa
Author: Naresh P R <pr...@gmail.com>
AuthorDate: Wed Oct 28 00:44:02 2020 -0700
HIVE-24294: TezSessionPool sessions can throw AssertionError (#1596) (Naresh Panchetty Ramanaiah, reviewed by Mustafa Iman, Laszlo Pinter)
---
.../org/apache/hadoop/hive/ql/exec/tez/TezSessionPoolManager.java | 5 ++---
.../test/org/apache/hadoop/hive/ql/exec/tez/TestTezSessionPool.java | 4 ++--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionPoolManager.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionPoolManager.java
index 83daf9d..30f7fae 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionPoolManager.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionPoolManager.java
@@ -495,12 +495,11 @@ public class TezSessionPoolManager extends TezSessionPoolSession.AbstractTrigger
static void reopenInternal(
TezSessionState sessionState) throws Exception {
- HiveResources resources = sessionState.extractHiveResources();
// TODO: close basically resets the object to a bunch of nulls.
// We should ideally not reuse the object because it's pointless and error-prone.
- sessionState.close(false);
+ sessionState.close(true);
// Note: scratchdir is reused implicitly because the sessionId is the same.
- sessionState.open(resources);
+ sessionState.open(sessionState.extractHiveResources());
}
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestTezSessionPool.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestTezSessionPool.java
index d5b683f..ee32d16 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestTezSessionPool.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestTezSessionPool.java
@@ -191,7 +191,7 @@ public class TestTezSessionPool {
poolManager.reopen(session);
- Mockito.verify(session).close(false);
+ Mockito.verify(session).close(true);
Mockito.verify(session).open(Mockito.<TezSessionState.HiveResources>any());
// mocked session starts with default queue
@@ -329,7 +329,7 @@ public class TestTezSessionPool {
poolManager.reopen(session);
- Mockito.verify(session).close(false);
+ Mockito.verify(session).close(true);
Mockito.verify(session).open(Mockito.<TezSessionState.HiveResources>any());
}