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

hapylestat 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 b6bc0a1  AMBARI-25328 When spark_transport_mode is set to 'http' then 
STS server fails to start in Ambari 2.7 (#3051) (ihorlukianov via dgrinenko)
b6bc0a1 is described below

commit b6bc0a133b03e1658d47a4b015bb61a435487fd4
Author: Ihor Lukianov <ihorlukia...@gmail.com>
AuthorDate: Wed Jul 17 15:52:01 2019 +0300

    AMBARI-25328 When spark_transport_mode is set to 'http' then STS server 
fails to start in Ambari 2.7 (#3051) (ihorlukianov via dgrinenko)
---
 .../ZEPPELIN/0.7.0/package/scripts/master.py            | 12 ++++++++----
 .../ZEPPELIN/0.7.0/package/scripts/params.py            | 17 ++++++++++++++++-
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
index c85a0e4..fe74b2c 100644
--- 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
+++ 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
@@ -575,10 +575,14 @@ class Master(Script):
           interpreter['properties']['spark2.proxy.user.property'] = 
'hive.server2.proxy.user'
           interpreter['properties']['spark2.url'] = 'jdbc:hive2://' + \
               params.spark2_thrift_server_hosts + ':' + 
params.spark2_hive_thrift_port + '/'
-          if params.hive_principal:
-            interpreter['properties']['spark2.url'] += ';principal=' + 
params.hive_principal
-          if params.hive_transport_mode:
-            interpreter['properties']['spark2.url'] += ';transportMode=' + 
params.hive_transport_mode
+          if params.spark2_hive_principal:
+            interpreter['properties']['spark2.url'] += ';principal=' + 
params.spark2_hive_principal
+          if params.spark2_transport_mode:
+            interpreter['properties']['spark2.url'] += ';transportMode=' + 
params.spark2_transport_mode
+          if params.spark2_http_path:
+            interpreter['properties']['spark2.url'] += ';httpPath=' + 
params.spark2_http_path
+          if params.spark2_ssl:
+            interpreter['properties']['spark2.url'] += ';ssl=true'
           if 'spark2.splitQueries' not in interpreter['properties']:
             interpreter['properties']['spark2.splitQueries'] = "true"
 
diff --git 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/params.py
index 529a1f6..1664e4a 100644
--- 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/params.py
@@ -177,12 +177,27 @@ if 'spark_thriftserver_hosts' in master_configs and 
len(master_configs['spark_th
 
 spark2_thrift_server_hosts = None
 spark2_hive_thrift_port = None
-spark2_hive_principal = None
+spark2_hive_principal = hive_principal
+spark2_transport_mode = hive_transport_mode
+spark2_http_path = None
+spark2_ssl = False
 if 'spark2_thriftserver_hosts' in master_configs and 
len(master_configs['spark2_thriftserver_hosts']) != 0:
   spark2_thrift_server_hosts = 
str(master_configs['spark2_thriftserver_hosts'][0])
   if config['configurations']['spark2-hive-site-override']:
     spark2_hive_thrift_port = 
config['configurations']['spark2-hive-site-override']['hive.server2.thrift.port']
 
+    if 'hive.server2.authentication.kerberos.principal' in 
config['configurations']['spark2-hive-site-override']:
+      spark2_hive_principal = 
config['configurations']['spark2-hive-site-override']['hive.server2.authentication.kerberos.principal']
+
+    if 'hive.server2.transport.mode' in 
config['configurations']['spark2-hive-site-override']:
+      spark2_transport_mode = 
config['configurations']['spark2-hive-site-override']['hive.server2.transport.mode']
+
+    if 'hive.server2.http.endpoint' in 
config['configurations']['spark2-hive-site-override']:
+     spark2_http_path = 
config['configurations']['spark2-hive-site-override']['hive.server2.http.endpoint']
+
+    if 'hive.server2.use.SSL' in 
config['configurations']['spark2-hive-site-override']:
+      spark2_ssl = 
default("configurations/spark2-hive-site-override/hive.server2.use.SSL", False)
+
 
 # detect hbase details if installed
 zookeeper_znode_parent = None

Reply via email to