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 2016/03/11 18:11:30 UTC

[1/2] ambari git commit: AMBARI-15389 Intermittent YARN service check failures during and post EU (dlysnichenko)

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 4277dbe8e -> 77dc81f63
  refs/heads/trunk 1b82cdab0 -> ba58ad1c2


AMBARI-15389 Intermittent YARN service check failures during and post EU (dlysnichenko)


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

Branch: refs/heads/trunk
Commit: ba58ad1c20c173315c099a9e7364f51fd0d4bd57
Parents: 1b82cda
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Fri Mar 11 19:10:18 2016 +0200
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Fri Mar 11 19:10:18 2016 +0200

----------------------------------------------------------------------
 .../YARN/2.1.0.2.0/package/scripts/service_check.py             | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/ba58ad1c/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/service_check.py
index d82b630..244d5d7 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/service_check.py
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/service_check.py
@@ -91,7 +91,10 @@ class ServiceCheckDefault(ServiceCheck):
       path_to_distributed_shell_jar = "/usr/lib/hadoop-yarn/hadoop-yarn-applications-distributedshell*.jar"
 
     yarn_distrubuted_shell_check_cmd = format("yarn org.apache.hadoop.yarn.applications.distributedshell.Client "
-                                              "-shell_command ls -num_containers {number_of_nm} -jar {path_to_distributed_shell_jar}")
+                                              "-shell_command ls "
+                                              "-num_containers {number_of_nm} "
+                                              "-jar {path_to_distributed_shell_jar} "
+                                              "-timeout 30000")
 
     if params.security_enabled:
       kinit_cmd = format("{kinit_path_local} -kt {smoke_user_keytab} {smokeuser_principal};")


[2/2] ambari git commit: AMBARI-15389 Intermittent YARN service check failures during and post EU (dlysnichenko)

Posted by dm...@apache.org.
AMBARI-15389 Intermittent YARN service check failures during and post EU (dlysnichenko)


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

Branch: refs/heads/branch-2.2
Commit: 77dc81f63a830a8fe9a99284d31dcfec98ac98d3
Parents: 4277dbe
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Fri Mar 11 19:10:18 2016 +0200
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Fri Mar 11 19:11:02 2016 +0200

----------------------------------------------------------------------
 .../YARN/2.1.0.2.0/package/scripts/service_check.py             | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/77dc81f6/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/service_check.py
index cd4d558..ae2dc43 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/service_check.py
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/service_check.py
@@ -91,7 +91,10 @@ class ServiceCheckDefault(ServiceCheck):
       path_to_distributed_shell_jar = "/usr/lib/hadoop-yarn/hadoop-yarn-applications-distributedshell*.jar"
 
     yarn_distrubuted_shell_check_cmd = format("yarn org.apache.hadoop.yarn.applications.distributedshell.Client "
-                                              "-shell_command ls -num_containers {number_of_nm} -jar {path_to_distributed_shell_jar}")
+                                              "-shell_command ls "
+                                              "-num_containers {number_of_nm} "
+                                              "-jar {path_to_distributed_shell_jar} "
+                                              "-timeout 30000")
 
     if params.security_enabled:
       kinit_cmd = format("{kinit_path_local} -kt {smoke_user_keytab} {smokeuser_principal};")