AMBARI-15171: Parameterize distro-specific stack information for SLIDER (Juanjo Marron via dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7d862f58 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7d862f58 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7d862f58 Branch: refs/heads/AMBARI-13364 Commit: 7d862f588ebf85fc77b24b4eab9ed4a4bc6bf99a Parents: b68758b Author: Di Li <d...@apache.org> Authored: Mon Feb 29 10:36:01 2016 -0500 Committer: Jayush Luniya <jlun...@hortonworks.com> Committed: Wed Mar 9 15:43:24 2016 -0800 ---------------------------------------------------------------------- .../SLIDER/0.60.0.2.2/package/scripts/params_linux.py | 10 +++++++--- .../SLIDER/0.60.0.2.2/package/scripts/service_check.py | 4 ++-- .../SLIDER/0.60.0.2.2/package/scripts/slider.py | 2 +- .../SLIDER/0.60.0.2.2/package/scripts/slider_client.py | 5 +++-- 4 files changed, 13 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/7d862f58/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/params_linux.py index b1cec11..be6d5a7 100644 --- a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/params_linux.py @@ -27,15 +27,19 @@ from resource_management.libraries.functions import get_kinit_path # server configurations config = Script.get_config() -slider_home_dir = '/usr/hdp/current/slider-client' +stack_dir = config['configurations']['cluster-env']['stack_dir'] +stack_version_ru_support = config['configurations']['cluster-env']['stack_version_ru_support'] + +slider_home_dir = format('{stack_dir}/current/slider-client') #hadoop params slider_bin_dir = "/usr/lib/slider/bin" -if Script.is_stack_greater_or_equal("2.2"): + +if Script.is_stack_greater_or_equal(stack_version_ru_support): slider_bin_dir = format('{slider_home_dir}/bin') slider_conf_dir = format("{slider_home_dir}/conf") -storm_slider_conf_dir = '/usr/hdp/current/storm-slider-client/conf' +storm_slider_conf_dir = format('{stack_dir}/current/storm-slider-client/conf') slider_lib_dir = format('{slider_home_dir}/lib') slider_tar_gz = format('{slider_lib_dir}/slider.tar.gz') http://git-wip-us.apache.org/repos/asf/ambari/blob/7d862f58/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/service_check.py index a16d0e7..344f0f1 100644 --- a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/service_check.py +++ b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/service_check.py @@ -37,8 +37,8 @@ class SliderServiceCheck(Script): def service_check(self, env): import params env.set_params(params) - - if Script.is_stack_greater_or_equal("2.2"): + + if Script.is_stack_greater_or_equal(params.stack_version_ru_support): copy_to_hdfs("slider", params.user_group, params.hdfs_user, host_sys_prepped=params.host_sys_prepped) smokeuser_kinit_cmd = format( http://git-wip-us.apache.org/repos/asf/ambari/blob/7d862f58/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/slider.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/slider.py b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/slider.py index f090583..46e5ab6 100644 --- a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/slider.py +++ b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/slider.py @@ -81,7 +81,7 @@ def slider(): File(format("{params.slider_conf_dir}/log4j.properties"), mode=0644 ) - if Script.is_stack_greater_or_equal("2.2"): + if Script.is_stack_greater_or_equal(params.stack_version_ru_support): File(params.slider_tar_gz, owner=params.hdfs_user, group=params.user_group, http://git-wip-us.apache.org/repos/asf/ambari/blob/7d862f58/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/slider_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/slider_client.py b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/slider_client.py index f584a12..3f995c8 100644 --- a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/slider_client.py +++ b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/slider_client.py @@ -32,13 +32,14 @@ class SliderClient(Script): @OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT) class SliderClientLinux(SliderClient): def get_stack_to_component(self): - return {"HDP": "slider-client"} + import params + return {params.stack_name: "slider-client"} def pre_upgrade_restart(self, env, upgrade_type=None): import params env.set_params(params) - if params.version and compare_versions(format_stack_version(params.version), '2.2.0.0') >= 0: + if params.version and compare_versions(format_stack_version(params.version), params.stack_version_ru_support) >= 0: conf_select.select(params.stack_name, "slider", params.version) stack_select.select("slider-client", params.version)
