Repository: ambari Updated Branches: refs/heads/branch-2.5 3bc3d6861 -> 7e8a8150e refs/heads/trunk 98f35228f -> 245fda34c
AMBARI-20344. RU: MR2 service check failed during rolling upgrade (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7e8a8150 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7e8a8150 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7e8a8150 Branch: refs/heads/branch-2.5 Commit: 7e8a8150e8e103e1835c72cfd8bcc65a623b6d46 Parents: 3bc3d68 Author: Lisnichenko Dmitro <dlysniche...@hortonworks.com> Authored: Tue Mar 7 18:02:05 2017 +0200 Committer: Lisnichenko Dmitro <dlysniche...@hortonworks.com> Committed: Tue Mar 7 18:02:05 2017 +0200 ---------------------------------------------------------------------- .../resource_management/libraries/functions/stack_select.py | 5 ++++- .../SLIDER/0.60.0.2.2/package/scripts/service_check.py | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8a8150/ambari-common/src/main/python/resource_management/libraries/functions/stack_select.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/stack_select.py b/ambari-common/src/main/python/resource_management/libraries/functions/stack_select.py index 513ceac..34c311d 100644 --- a/ambari-common/src/main/python/resource_management/libraries/functions/stack_select.py +++ b/ambari-common/src/main/python/resource_management/libraries/functions/stack_select.py @@ -91,7 +91,10 @@ SERVICE_CHECK_DIRECTORY_MAP = { "PIG_SERVICE_CHECK" : "hadoop-client", "HIVE_SERVICE_CHECK" : "hadoop-client", "OOZIE_SERVICE_CHECK" : "hadoop-client", - "MAHOUT_SERVICE_CHECK" : "mahout-client" + "MAHOUT_SERVICE_CHECK" : "mahout-client", + "MAPREDUCE2_SERVICE_CHECK" : "hadoop-client", + "YARN_SERVICE_CHECK" : "hadoop-client", + "SLIDER_SERVICE_CHECK" : "slider-client" } # <stack-root>/current/hadoop-client/[bin|sbin|libexec|lib] http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8a8150/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 2f656c7..3b2c4ab 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 @@ -39,6 +39,7 @@ class SliderServiceCheck(Script): def service_check(self, env): import params env.set_params(params) + environment={'HADOOP_CONF_DIR': '/usr/hdp/2.4.3.0-227/hadoop/conf'} 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, skip=params.sysprep_skip_copy_tarballs_hdfs) @@ -52,7 +53,8 @@ class SliderServiceCheck(Script): tries=3, try_sleep=5, user=params.smokeuser, - logoutput=True + logoutput=True, + environment=environment )