From 36b2ffcb55eeac4a8bda36ee0c4d92832ca043b1 Mon Sep 17 00:00:00 2001
From: Ayush Saxena <ayushsaxena@apache.org>
Date: Fri, 1 May 2026 00:16:46 +0530
Subject: [PATCH] HIVE-29589: Fix broken docker setup in non llap mode

---
 packaging/src/docker/docker-compose.yml | 1 +
 packaging/src/docker/entrypoint.sh      | 6 +++---
 packaging/src/docker/start-hive.sh      | 2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packaging/src/docker/docker-compose.yml b/packaging/src/docker/docker-compose.yml
index 475b9e6669e4..b1e14207ae01 100644
--- a/packaging/src/docker/docker-compose.yml
+++ b/packaging/src/docker/docker-compose.yml
@@ -184,6 +184,7 @@ services:
       LLAP_WEB_PORT: '15001'
       LLAP_MANAGEMENT_RPC_PORT: '15004'
       LLAP_SHUFFLE_PORT: '15551'
+      HIVE_ZOOKEEPER_QUORUM: "${HIVE_ZOOKEEPER_QUORUM}"
 
       DEFAULT_FS: "${DEFAULT_FS}"
       S3_ENDPOINT_URL: "${S3_ENDPOINT_URL}"
diff --git a/packaging/src/docker/entrypoint.sh b/packaging/src/docker/entrypoint.sh
index d06cd06dabbc..656bf63ec601 100644
--- a/packaging/src/docker/entrypoint.sh
+++ b/packaging/src/docker/entrypoint.sh
@@ -41,11 +41,11 @@ export HIVE_WAREHOUSE_PATH="${HIVE_WAREHOUSE_PATH:-/opt/hive/data/warehouse}"
 export HIVE_SCRATCH_DIR="${HIVE_SCRATCH_DIR:-/opt/hive/scratch}"
 export HIVE_QUERY_RESULTS_CACHE_DIRECTORY="${HIVE_WAREHOUSE_PATH:-/opt/hive/scratch/_resultscache_}"
 
-export HIVE_ZOOKEEPER_QUORUM="${HIVE_ZOOKEEPER_QUORUM:-zookeeper:2181}"
+export HIVE_ZOOKEEPER_QUORUM="${HIVE_ZOOKEEPER_QUORUM:-}"
 export HIVE_LLAP_DAEMON_SERVICE_HOSTS="${HIVE_LLAP_DAEMON_SERVICE_HOSTS:-@llap0}"
 
-export HIVE_SERVER2_TEZ_USE_EXTERNAL_SESSIONS="${HIVE_SERVER2_TEZ_USE_EXTERNAL_SESSIONS:-true}"
-export TEZ_FRAMEWORK_MODE="${TEZ_FRAMEWORK_MODE:-STANDALONE_ZOOKEEPER}"
+export HIVE_SERVER2_TEZ_USE_EXTERNAL_SESSIONS="${HIVE_SERVER2_TEZ_USE_EXTERNAL_SESSIONS:-false}"
+export TEZ_FRAMEWORK_MODE="${TEZ_FRAMEWORK_MODE:-}"
 export TEZ_AM_REGISTRY_NAMESPACE="${TEZ_AM_REGISTRY_NAMESPACE:-/tez_am/server}"
 export TEZ_AM_ZOOKEEPER_QUORUM="${TEZ_AM_ZOOKEEPER_QUORUM:-${HIVE_ZOOKEEPER_QUORUM}}"
 
diff --git a/packaging/src/docker/start-hive.sh b/packaging/src/docker/start-hive.sh
index d40aed569589..82a4c9952458 100755
--- a/packaging/src/docker/start-hive.sh
+++ b/packaging/src/docker/start-hive.sh
@@ -32,6 +32,8 @@ for arg in "$@"; do
       SCALE="--scale llapdaemon=2"
       export HIVE_ZOOKEEPER_QUORUM=zookeeper:2181
       export HIVE_LLAP_DAEMON_SERVICE_HOSTS=@llap0
+      export HIVE_SERVER2_TEZ_USE_EXTERNAL_SESSIONS=true
+      export TEZ_FRAMEWORK_MODE=STANDALONE_ZOOKEEPER
       ;;
     --ozone)
       COMPOSE_FILES+=":storage/ozone/docker-compose.yml"