This is an automated email from the ASF dual-hosted git repository.
amagyar pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new 09400e2 AMBARI-22863. Hive should handle a customized Zookeeper
service princ… (#2244)
09400e2 is described below
commit 09400e2905f3b101c72e8383e060b9575e89b825
Author: Attila Magyar <[email protected]>
AuthorDate: Wed Sep 5 10:37:47 2018 +0200
AMBARI-22863. Hive should handle a customized Zookeeper service princ…
(#2244)
* AMBARI-22863. Hive should handle a customized Zookeeper service principal
name (amagyar)
* AMBARI-22863. Hive should handle a customized Zookeeper service principal
name (amagyar)
---
.../common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py | 3 +++
.../resources/stacks/HDP/2.2/services/HIVE/configuration/hive-env.xml | 4 ++++
.../resources/stacks/HDP/2.3/services/HIVE/configuration/hive-env.xml | 4 ++++
.../resources/stacks/HDP/2.5/services/HIVE/configuration/hive-env.xml | 4 ++++
.../HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml | 4 ++++
.../resources/stacks/HDP/2.6/services/HIVE/configuration/hive-env.xml | 4 ++++
.../HDP/2.6/services/HIVE/configuration/hive-interactive-env.xml | 4 ++++
7 files changed, 27 insertions(+)
diff --git
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
index 77ad09a..668fca5 100644
---
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
+++
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
@@ -370,6 +370,9 @@ hive_http_endpoint =
default('/configurations/hive-site/hive.server2.thrift.http
hive_server_principal =
config['configurations']['hive-site']['hive.server2.authentication.kerberos.principal']
hive_server2_authentication =
config['configurations']['hive-site']['hive.server2.authentication']
+zk_principal_name =
default("/configurations/zookeeper-env/zookeeper_principal_name",
"zookeeper/[email protected]")
+zk_principal_user = zk_principal_name.split('/')[0]
+
# ssl options
hive_ssl = default('/configurations/hive-site/hive.server2.use.SSL', False)
hive_ssl_keystore_path =
default('/configurations/hive-site/hive.server2.keystore.path', None)
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-env.xml
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-env.xml
index aafc10e..0432711 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-env.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-env.xml
@@ -57,6 +57,10 @@ else
export HADOOP_HEAPSIZE={{hive_heapsize}} # Setting for HiveServer2 and Client
fi
+{% if security_enabled %}
+export HADOOP_OPTS="$HADOOP_OPTS
-Dzookeeper.sasl.client.username={{zk_principal_user}}"
+{% endif %}
+
export HADOOP_CLIENT_OPTS="$HADOOP_CLIENT_OPTS -Xmx${HADOOP_HEAPSIZE}m"
# Larger heap size may be required when running queries over large number of
files or partitions.
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-env.xml
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-env.xml
index 4092a14..b633382 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-env.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-env.xml
@@ -42,6 +42,10 @@ else
export HADOOP_HEAPSIZE={{hive_heapsize}} # Setting for HiveServer2 and Client
fi
+{% if security_enabled %}
+export HADOOP_OPTS="$HADOOP_OPTS
-Dzookeeper.sasl.client.username={{zk_principal_user}}"
+{% endif %}
+
export HADOOP_CLIENT_OPTS="$HADOOP_CLIENT_OPTS -Xmx${HADOOP_HEAPSIZE}m"
# Larger heap size may be required when running queries over large number of
files or partitions.
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-env.xml
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-env.xml
index ca44bf2..472043b 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-env.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-env.xml
@@ -72,6 +72,10 @@
export HADOOP_HEAPSIZE={{hive_heapsize}} # Setting for HiveServer2 and
Client
fi
+ {% if security_enabled %}
+ export HADOOP_OPTS="$HADOOP_OPTS
-Dzookeeper.sasl.client.username={{zk_principal_user}}"
+ {% endif %}
+
export HADOOP_CLIENT_OPTS="$HADOOP_CLIENT_OPTS -Xmx${HADOOP_HEAPSIZE}m"
# Larger heap size may be required when running queries over large
number of files or partitions.
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
index f3e7be1..1cb3c02 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
@@ -264,6 +264,10 @@
export HADOOP_HEAPSIZE={{hive_interactive_heapsize}} # Setting for
HiveServer2 and Client
fi
+ {% if security_enabled %}
+ export HADOOP_OPTS="$HADOOP_OPTS
-Dzookeeper.sasl.client.username={{zk_principal_user}}"
+ {% endif %}
+
export HADOOP_CLIENT_OPTS="$HADOOP_CLIENT_OPTS -Xmx${HADOOP_HEAPSIZE}m"
# Larger heap size may be required when running queries over large
number of files or partitions.
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-env.xml
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-env.xml
index 6f44ff7..9780a27 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-env.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-env.xml
@@ -78,6 +78,10 @@ else
export HADOOP_HEAPSIZE={{hive_heapsize}} # Setting for HiveServer2 and Client
fi
+{% if security_enabled %}
+export HADOOP_OPTS="$HADOOP_OPTS
-Dzookeeper.sasl.client.username={{zk_principal_user}}"
+{% endif %}
+
export HADOOP_CLIENT_OPTS="$HADOOP_CLIENT_OPTS -Xmx${HADOOP_HEAPSIZE}m"
export HADOOP_CLIENT_OPTS="$HADOOP_CLIENT_OPTS{{heap_dump_opts}}"
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-env.xml
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-env.xml
index 86720f4..8c75e30 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-env.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-env.xml
@@ -116,6 +116,10 @@ else
export HADOOP_HEAPSIZE={{hive_interactive_heapsize}} # Setting for
HiveServer2 and Client
fi
+{% if security_enabled %}
+export HADOOP_OPTS="$HADOOP_OPTS
-Dzookeeper.sasl.client.username={{zk_principal_user}}"
+{% endif %}
+
export HADOOP_CLIENT_OPTS="$HADOOP_CLIENT_OPTS -Xmx${HADOOP_HEAPSIZE}m"
export HADOOP_CLIENT_OPTS="$HADOOP_CLIENT_OPTS{{heap_dump_opts}}"
