You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jl...@apache.org on 2016/03/30 22:29:28 UTC
ambari git commit: AMBARI-15171: Stack Featurize Slider Service
(jluniya)
Repository: ambari
Updated Branches:
refs/heads/trunk ef30868be -> 2ba007820
AMBARI-15171: Stack Featurize Slider Service (jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2ba00782
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2ba00782
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2ba00782
Branch: refs/heads/trunk
Commit: 2ba00782081141a6fe7ab5451ceb1c9ca410e7b9
Parents: ef30868
Author: Jayush Luniya <jl...@hortonworks.com>
Authored: Wed Mar 30 13:29:19 2016 -0700
Committer: Jayush Luniya <jl...@hortonworks.com>
Committed: Wed Mar 30 13:29:19 2016 -0700
----------------------------------------------------------------------
.../SLIDER/0.60.0.2.2/package/scripts/params.py | 4 ----
.../SLIDER/0.60.0.2.2/package/scripts/params_linux.py | 12 +++++++++---
.../SLIDER/0.60.0.2.2/package/scripts/service_check.py | 4 +++-
.../SLIDER/0.60.0.2.2/package/scripts/slider.py | 4 +++-
.../SLIDER/0.60.0.2.2/package/scripts/slider_client.py | 7 +++++--
5 files changed, 20 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ba00782/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/params.py b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/params.py
index e7f5410..842e5ed 100644
--- a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/params.py
@@ -20,7 +20,6 @@ limitations under the License.
from ambari_commons.os_check import OSCheck
from resource_management.libraries.functions import format
from resource_management.libraries.functions import conf_select
-from resource_management.libraries.functions.version import format_stack_version
from resource_management.libraries.functions.default import default
from resource_management.libraries.functions import get_kinit_path
from resource_management.libraries.script.script import Script
@@ -40,9 +39,6 @@ stack_name = default("/hostLevelParams/stack_name", None)
# New Cluster Stack Version that is defined during the RESTART of a Stack Upgrade
version = default("/commandParams/version", None)
-stack_version_unformatted = config['hostLevelParams']['stack_version']
-stack_version_formatted = format_stack_version(stack_version_unformatted)
-
#hadoop params
hadoop_conf_dir = conf_select.get_hadoop_conf_dir()
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ba00782/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 aa5d3a5..6bf41b4 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
@@ -23,20 +23,26 @@ from resource_management.libraries.script.script import Script
from resource_management.libraries.functions.format import format
from resource_management.libraries.functions.default import default
from resource_management.libraries.functions import get_kinit_path
+from resource_management.libraries.functions import StackFeature
+from resource_management.libraries.functions.stack_features import check_stack_feature
+from resource_management.libraries.functions.version import format_stack_version
from resource_management.libraries.functions.get_not_managed_resources import get_not_managed_resources
# server configurations
config = Script.get_config()
+stack_root = Script.get_stack_root()
-slider_home_dir = '/usr/hdp/current/slider-client'
+slider_home_dir = format('{stack_root}/current/slider-client')
+stack_version_unformatted = str(config['hostLevelParams']['stack_version'])
+stack_version_formatted = format_stack_version(stack_version_unformatted)
#hadoop params
slider_bin_dir = "/usr/lib/slider/bin"
-if Script.is_stack_greater_or_equal("2.2"):
+if stack_version_formatted and check_stack_feature(StackFeature.ROLLING_UPGRADE, stack_version_formatted):
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_root}/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/2ba00782/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..91e4959 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
@@ -21,6 +21,8 @@ limitations under the License.
from resource_management import *
from resource_management.libraries.functions.copy_tarball import copy_to_hdfs
from ambari_commons import OSConst
+from resource_management.libraries.functions import StackFeature
+from resource_management.libraries.functions.stack_features import check_stack_feature
from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl
class SliderServiceCheck(Script):
@@ -38,7 +40,7 @@ class SliderServiceCheck(Script):
import params
env.set_params(params)
- if Script.is_stack_greater_or_equal("2.2"):
+ if params.stack_version_formatted and check_stack_feature(StackFeature.COPY_TARBALL_TO_HDFS, params.stack_version_formatted):
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/2ba00782/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..8d80700 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
@@ -21,6 +21,8 @@ Ambari Agent
import os
from resource_management import *
from ambari_commons import OSConst
+from resource_management.libraries.functions import StackFeature
+from resource_management.libraries.functions.stack_features import check_stack_feature
from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl
@OsFamilyFuncImpl(os_family=OSConst.WINSRV_FAMILY)
@@ -81,7 +83,7 @@ def slider():
File(format("{params.slider_conf_dir}/log4j.properties"),
mode=0644
)
- if Script.is_stack_greater_or_equal("2.2"):
+ if params.stack_version_formatted and check_stack_feature(StackFeature.COPY_TARBALL_TO_HDFS, params.stack_version_formatted):
File(params.slider_tar_gz,
owner=params.hdfs_user,
group=params.user_group,
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ba00782/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..af08a51 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
@@ -21,6 +21,8 @@ limitations under the License.
from resource_management import *
from resource_management.libraries.functions import conf_select
from resource_management.libraries.functions import stack_select
+from resource_management.libraries.functions import StackFeature
+from resource_management.libraries.functions.stack_features import check_stack_feature
from slider import slider
from ambari_commons import OSConst
from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl
@@ -32,13 +34,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 check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version):
conf_select.select(params.stack_name, "slider", params.version)
stack_select.select("slider-client", params.version)