HIVE-24294: TezSessionPool sessions can throw AssertionError (apache#…

…1596) (Naresh Panchetty Ramanaiah, reviewed by Mustafa Iman, Laszlo Pinter)
jshmchenxi · Oct 28, 2020 · 78840c2 · 78840c2
1 parent db895f3
commit 78840c2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 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
@@ -495,12 +495,11 @@ public TezSessionState reopen(TezSessionState sessionState) throws Exception {
 
   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
@@ -191,7 +191,7 @@ public void testSessionReopen() {
 
       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 void testCloseAndOpenDefault() throws Exception {
 
     poolManager.reopen(session);
 
-    Mockito.verify(session).close(false);
+    Mockito.verify(session).close(true);
     Mockito.verify(session).open(Mockito.<TezSessionState.HiveResources>any());
   }