Repository: ambari Updated Branches: refs/heads/branch-2.4 49431ac8d -> 05aa4b79d
AMBARI-17807. Should only upload spark assembly jar once (Jeff Zhang via smohanty) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/05aa4b79 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/05aa4b79 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/05aa4b79 Branch: refs/heads/branch-2.4 Commit: 05aa4b79d725e370df88013d6627ca16fa1c0981 Parents: 49431ac Author: Sumit Mohanty <[email protected]> Authored: Wed Jul 20 13:50:15 2016 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Wed Jul 20 13:53:22 2016 -0700 ---------------------------------------------------------------------- .../common-services/SPARK/1.2.1/package/scripts/spark_service.py | 2 +- .../common-services/SPARK2/2.0.0/package/scripts/spark_service.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/05aa4b79/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/spark_service.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/spark_service.py b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/spark_service.py index c3784d6..704af68 100644 --- a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/spark_service.py +++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/spark_service.py @@ -38,7 +38,7 @@ def spark_service(name, upgrade_type=None, action=None): if effective_version: effective_version = format_stack_version(effective_version) - if effective_version and check_stack_feature(StackFeature.SPARK_16PLUS, effective_version): + if name == 'jobhistoryserver' and effective_version and check_stack_feature(StackFeature.SPARK_16PLUS, effective_version): # copy spark-hdp-assembly.jar to hdfs copy_to_hdfs("spark", params.user_group, params.hdfs_user, host_sys_prepped=params.host_sys_prepped) # create spark history directory http://git-wip-us.apache.org/repos/asf/ambari/blob/05aa4b79/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_service.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_service.py b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_service.py index a2ba4de..915fb66 100755 --- a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_service.py +++ b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_service.py @@ -55,7 +55,7 @@ def spark_service(name, upgrade_type=None, action=None): if effective_version: effective_version = format_stack_version(effective_version) - if effective_version and check_stack_feature(StackFeature.SPARK_16PLUS, effective_version): + if name == 'jobhistoryserver' and effective_version and check_stack_feature(StackFeature.SPARK_16PLUS, effective_version): # create & copy spark2-hdp-yarn-archive.tar.gz to hdfs source_dir=params.spark_home+"/jars" tmp_archive_file=get_tarball_paths("spark2")[1]
