Repository: ambari Updated Branches: refs/heads/branch-2.2 33fdfc658 -> ea9339f24
AMBARI-14428. Spark client and History Server failed to deploy from first try on HDP-2.3.0.0 (Dmytro Grinenko via alejandro) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ea9339f2 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ea9339f2 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ea9339f2 Branch: refs/heads/branch-2.2 Commit: ea9339f2414b2054375c83a794c9cd9ab9f75e5c Parents: 33fdfc6 Author: Alejandro Fernandez <[email protected]> Authored: Thu Dec 17 13:24:51 2015 -0800 Committer: Alejandro Fernandez <[email protected]> Committed: Thu Dec 17 13:24:51 2015 -0800 ---------------------------------------------------------------------- .../common-services/SPARK/1.2.0.2.2/package/scripts/params.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/ea9339f2/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 f0d587d..30b3d0f 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 @@ -147,10 +147,7 @@ if security_enabled: spark_thrift_sparkconf = None spark_thrift_cmd_opts_properties = '' -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 : +if has_spark_thriftserver 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:
