ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject ambari git commit: AMBARI-15583 YARN service check fails due to syntax error (dsen)
Date Fri, 25 Mar 2016 11:39:03 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 d650e5fa7 -> 7e6b33a19


AMBARI-15583 YARN service check fails due to syntax error (dsen)


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

Branch: refs/heads/branch-2.2
Commit: 7e6b33a19798da189ab5738cb0d2c6e5bb02a113
Parents: d650e5f
Author: Dmytro Sen <dsen@apache.org>
Authored: Fri Mar 25 13:38:54 2016 +0200
Committer: Dmytro Sen <dsen@apache.org>
Committed: Fri Mar 25 13:38:54 2016 +0200

----------------------------------------------------------------------
 .../YARN/2.1.0.2.0/package/scripts/service_check.py     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/7e6b33a1/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 0afdd26..3c58e8e 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
@@ -99,13 +99,13 @@ class ServiceCheckDefault(ServiceCheck):
     else:
       path_to_distributed_shell_jar = "/usr/lib/hadoop-yarn/hadoop-yarn-applications-distributedshell*.jar"
 
+    yarn_distrubuted_shell_check_params = ["yarn org.apache.hadoop.yarn.applications.distributedshell.Client",
+                                           "-shell_command", "ls", "-num_containers", "{number_of_nm}",
+                                           "-jar", "{path_to_distributed_shell_jar}",
+                                           "-jar", "{path_to_distributed_shell_jar}", "-timeout",
"300000",
+                                           "--queue", "{queue_for_check}"]
 
-    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} "
-                                              "-timeout 300000"
-                                              "--queue {queue_for_check}")
+    yarn_distrubuted_shell_check_cmd = format(" ".join(yarn_distrubuted_shell_check_params))
 
     if params.security_enabled:
       kinit_cmd = format("{kinit_path_local} -kt {smoke_user_keytab} {smokeuser_principal};")


Mime
View raw message