You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2016/03/25 12:36:07 UTC

ambari git commit: AMBARI-15583 YARN service check fails due to syntax error (dsen)

Repository: ambari
Updated Branches:
  refs/heads/trunk 15e58e419 -> c0a4d5eef


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/c0a4d5ee
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c0a4d5ee
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c0a4d5ee

Branch: refs/heads/trunk
Commit: c0a4d5eef5eeeb76b672f59cbb4ab871fb695f80
Parents: 15e58e4
Author: Dmytro Sen <ds...@apache.org>
Authored: Fri Mar 25 13:35:54 2016 +0200
Committer: Dmytro Sen <ds...@apache.org>
Committed: Fri Mar 25 13:35:54 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/c0a4d5ee/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 cecf37f..83bf460 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,12 +99,11 @@ class ServiceCheckDefault(ServiceCheck):
     else:
       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} "
-                                              "-timeout 300000"
-                                              "--queue {queue_for_check}")
+    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}", "-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};")