You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2017/03/09 14:19:40 UTC

[1/2] ambari git commit: AMBARI-20344. RU: MR2 service check failed during rolling upgrade. Remove clutter from slider service check (dlysnichenko)

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 c9f705655 -> c52027c84
  refs/heads/trunk 625dc70b8 -> d3f7c8fb3


AMBARI-20344. RU: MR2 service check failed during rolling upgrade. Remove clutter from slider service check (dlysnichenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d3f7c8fb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d3f7c8fb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d3f7c8fb

Branch: refs/heads/trunk
Commit: d3f7c8fb3d518580c56d4247dbcf4d3293c04139
Parents: 625dc70
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Thu Mar 9 16:18:15 2017 +0200
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Thu Mar 9 16:18:15 2017 +0200

----------------------------------------------------------------------
 .../SLIDER/0.60.0.2.2/package/scripts/service_check.py             | 2 --
 1 file changed, 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/d3f7c8fb/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 a363a32..e77ded3 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
@@ -41,7 +41,6 @@ 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)
@@ -56,7 +55,6 @@ class SliderServiceCheck(Script):
             try_sleep=5,
             user=params.smokeuser,
             logoutput=True,
-            environment=environment
     )
 
 


[2/2] ambari git commit: AMBARI-20344. RU: MR2 service check failed during rolling upgrade. Remove clutter from slider service check (dlysnichenko)

Posted by dm...@apache.org.
AMBARI-20344. RU: MR2 service check failed during rolling upgrade. Remove clutter from slider service check (dlysnichenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c52027c8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c52027c8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c52027c8

Branch: refs/heads/branch-2.5
Commit: c52027c849038c11e58e1c0b4eecb740bc9d0a1a
Parents: c9f7056
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Thu Mar 9 16:18:15 2017 +0200
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Thu Mar 9 16:19:15 2017 +0200

----------------------------------------------------------------------
 .../SLIDER/0.60.0.2.2/package/scripts/service_check.py             | 2 --
 1 file changed, 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/c52027c8/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 3b2c4ab..f8e213c 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,7 +39,6 @@ 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)
@@ -54,7 +53,6 @@ class SliderServiceCheck(Script):
             try_sleep=5,
             user=params.smokeuser,
             logoutput=True,
-            environment=environment
     )