ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smoha...@apache.org
Subject ambari git commit: AMBARI-14270. Hive Server 2 silently dies on Blueprint cluster (Oliver Szabo via smohanty)
Date Wed, 09 Dec 2015 18:53:23 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 2bbbf42f3 -> 7640ce4f9


AMBARI-14270. Hive Server 2 silently dies on Blueprint cluster (Oliver Szabo via smohanty)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7640ce4f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7640ce4f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7640ce4f

Branch: refs/heads/branch-2.2
Commit: 7640ce4f98cae7c089c18285a4f1835a2ed26395
Parents: 2bbbf42
Author: Sumit Mohanty <smohanty@hortonworks.com>
Authored: Wed Dec 9 10:50:12 2015 -0800
Committer: Sumit Mohanty <smohanty@hortonworks.com>
Committed: Wed Dec 9 10:50:12 2015 -0800

----------------------------------------------------------------------
 .../0.5.0.2.2/package/scripts/params_linux.py   |  3 +++
 .../SPARK/1.2.0.2.2/package/scripts/params.py   | 27 +++++++++++---------
 2 files changed, 18 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/7640ce4f/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
index f26874f..a4e31bf 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
@@ -25,6 +25,7 @@ from resource_management.libraries.functions import format
 from resource_management.libraries.functions.version import format_hdp_stack_version
 from resource_management.libraries.functions.default import default
 from resource_management.libraries.functions.get_port_from_url import get_port_from_url
+from resource_management.libraries.functions.get_hdp_version import get_hdp_version
 from resource_management.libraries.functions import get_kinit_path
 from resource_management.libraries.script.script import Script
 from status_params import *
@@ -39,6 +40,8 @@ tmp_dir = Script.get_tmp_dir()
 stack_name = default("/hostLevelParams/stack_name", None)
 upgrade_direction = default("/commandParams/upgrade_direction", None)
 version = default("/commandParams/version", None)
+if version is None:
+  version = get_hdp_version('knox-server')
 # E.g., 2.3.2.0
 version_formatted = format_hdp_stack_version(version)
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/7640ce4f/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
index 18a0052..c4bbdc1 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
@@ -27,6 +27,7 @@ import resource_management.libraries.functions
 from resource_management.libraries.functions import conf_select
 from resource_management.libraries.functions import hdp_select
 from resource_management.libraries.functions import format
+from resource_management.libraries.functions.get_hdp_version import get_hdp_version
 from resource_management.libraries.functions.version import format_hdp_stack_version
 from resource_management.libraries.functions.default import default
 from resource_management.libraries.functions import get_kinit_path
@@ -54,13 +55,6 @@ host_sys_prepped = default("/hostLevelParams/host_sys_prepped", False)
 # New Cluster Stack Version that is defined during the RESTART of a Stack Upgrade
 version = default("/commandParams/version", None)
 
-# TODO! FIXME! Version check is not working as of today :
-#   $ yum list installed | grep hdp-select
-#   hdp-select.noarch                            2.2.1.0-2340.el6           @HDP-2.2
-# And hdp_stack_version returned from hostLevelParams/stack_version is : 2.2.0.0
-# Commenting out for time being
-#stack_is_hdp22_or_further = hdp_stack_version != "" and compare_versions(hdp_stack_version,
'2.2.1.0') >= 0
-
 spark_conf = '/etc/spark/conf'
 hadoop_conf_dir = conf_select.get_hadoop_conf_dir()
 hadoop_bin_dir = hdp_select.get_hadoop_dir("bin")
@@ -152,12 +146,21 @@ if security_enabled:
 # thrift server support - available on HDP 2.3 or higher
 spark_thrift_sparkconf = None
 spark_thrift_cmd_opts_properties = ''
-if version and compare_versions(format_hdp_stack_version(version), '2.3.2.0') >= 0 \
-    and 'spark-thrift-sparkconf' in config['configurations']:
-  spark_thrift_sparkconf = config['configurations']['spark-thrift-sparkconf']
-  spark_thrift_cmd_opts_properties = config['configurations']['spark-env']['spark_thrift_cmd_opts']
 
-  if is_hive_installed:
+if 'spark-thrift-sparkconf' in config['configurations']:
+  if version is None: # set hdp version by hdp-select if "/commandParams/version" is missing
+    version = get_hdp_version('spark-thriftserver')
+  if version and compare_versions(format_hdp_stack_version(version), '2.3.2.0') >= 0 :
+    spark_thrift_sparkconf = config['configurations']['spark-thrift-sparkconf']
+    spark_thrift_cmd_opts_properties = config['configurations']['spark-env']['spark_thrift_cmd_opts']
+    if is_hive_installed:
+      # update default metastore client properties (async wait for metastore component) it
is useful in case of
+      # blueprint provisioning when hive-metastore and spark-thriftserver is not on the same
host.
+      spark_hive_properties.update({
+        'hive.metastore.client.connect.retry.delay' : config['configurations']['hive-site']['hive.metastore.client.connect.retry.delay'],
+        'hive.metastore.connect.retries' : config['configurations']['hive-site']['hive.metastore.connect.retries'],
+        'hive.metastore.client.socket.timeout' : config['configurations']['hive-site']['hive.metastore.client.socket.timeout']
+      })
       spark_hive_properties.update(config['configurations']['spark-hive-site-override'])
 
 default_fs = config['configurations']['core-site']['fs.defaultFS']


Mime
View raw message