(hive) branch master updated: HIVE-27023: Add setting to prevent tez session from being opened during startup (#4015) (Alagappan Maruthappan reviewed by Laszlo Bodor)

[abstractdog]

This is an automated email from the ASF dual-hosted git repository.

abstractdog 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 5d0f2502afa HIVE-27023: Add setting to prevent tez session from being 
opened during startup (#4015) (Alagappan Maruthappan reviewed by Laszlo Bodor)
5d0f2502afa is described below

commit 5d0f2502afaf6a220bc14a2cad5f643441707a47
Author: Alagappan Maruthappan <aswin.alagappa...@gmail.com>
AuthorDate: Fri Jan 12 23:40:19 2024 -0800

    HIVE-27023: Add setting to prevent tez session from being opened during 
startup (#4015) (Alagappan Maruthappan reviewed by Laszlo Bodor)
---
 cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java          | 1 +
 common/src/java/org/apache/hadoop/hive/conf/HiveConf.java       | 6 +++++-
 ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java | 4 +++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java 
b/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java
index 6eb679ddebc..93e06208e1e 100644
--- a/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java
+++ b/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java
@@ -809,6 +809,7 @@ public class CliDriver {
     } catch (CommandProcessorException e) {
       return e.getResponseCode();
     } finally {
+      SessionState.endStart(ss);
       ss.resetThreadName();
       ss.close();
     }
diff --git a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java 
b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
index 9a1433dc21d..3052349b549 100644
--- a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
+++ b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
@@ -3693,8 +3693,12 @@ public class HiveConf extends Configuration {
     HIVE_CLI_PRINT_ESCAPE_CRLF("hive.cli.print.escape.crlf", false,
         "Whether to print carriage returns and line feeds in row output as 
escaped \\r and \\n"),
 
+    HIVE_CLI_TEZ_INITIALIZE_SESSION("hive.cli.tez.initialize.session", true,
+        "When enabled, CLI running with Tez will preemptively open a tez 
session during start up."),
+
     HIVE_CLI_TEZ_SESSION_ASYNC("hive.cli.tez.session.async", true, "Whether to 
start Tez\n" +
-        "session in background when running CLI with Tez, allowing CLI to be 
available earlier."),
+        "session in background when running CLI with Tez, allowing CLI to be 
available earlier. " +
+        "If hive.cli.tez.initialize.session is set to false, this value is 
ignored."),
 
     
HIVE_DISABLE_UNSAFE_EXTERNALTABLE_OPERATIONS("hive.disable.unsafe.external.table.operations",
 true,
         "Whether to disable certain optimizations and operations on external 
tables," +
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java 
b/ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java
index 3ba5fb3361f..533462fe507 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java
@@ -733,7 +733,9 @@ public class SessionState implements ISessionAuthState{
     }
 
     String engine = HiveConf.getVar(startSs.getConf(), 
HiveConf.ConfVars.HIVE_EXECUTION_ENGINE);
-    if (!engine.equals("tez") || startSs.isHiveServerQuery) {
+
+    if (!engine.equals("tez") || startSs.isHiveServerQuery
+            || !HiveConf.getBoolVar(startSs.getConf(), 
ConfVars.HIVE_CLI_TEZ_INITIALIZE_SESSION)) {
       return;
     }