ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject git commit: AMBARI-4978. Storm Service Check failed for Mixed OS (Arsen Babych via aonishuk)
Date Fri, 07 Mar 2014 15:41:43 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 8da623ed5 -> 5237cfd0b


AMBARI-4978. Storm Service Check failed for Mixed OS (Arsen Babych via
aonishuk)


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

Branch: refs/heads/trunk
Commit: 5237cfd0b77d8c416b90f6a379fa7c2bad84e214
Parents: 8da623e
Author: Andrew Onischuk <aonishuk@hortonworks.com>
Authored: Fri Mar 7 07:41:04 2014 -0800
Committer: Andrew Onischuk <aonishuk@hortonworks.com>
Committed: Fri Mar 7 07:41:04 2014 -0800

----------------------------------------------------------------------
 .../HDP/2.1.1/services/STORM/package/scripts/service_check.py      | 2 +-
 .../src/test/python/stacks/2.1.1/STORM/test_service_check.py       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/5237cfd0/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/service_check.py
b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/service_check.py
index 51c790f..3fc62fb 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/service_check.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/service_check.py
@@ -32,7 +32,7 @@ class ServiceCheck(Script):
          content=StaticFile("wordCount.jar")
     )
 
-    cmd = format("env PATH=$PATH:{java64_home}/bin storm jar /tmp/wordCount.jar storm.starter.WordCountTopology
WordCount{unique} -c nimbus.host={nimbus_host}")
+    cmd = format("env JAVA_HOME={java64_home} storm jar /tmp/wordCount.jar storm.starter.WordCountTopology
WordCount{unique} -c nimbus.host={nimbus_host}")
 
     Execute(cmd,
             logoutput=True

http://git-wip-us.apache.org/repos/asf/ambari/blob/5237cfd0/ambari-server/src/test/python/stacks/2.1.1/STORM/test_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1.1/STORM/test_service_check.py b/ambari-server/src/test/python/stacks/2.1.1/STORM/test_service_check.py
index fdc8305..c8bf27a 100644
--- a/ambari-server/src/test/python/stacks/2.1.1/STORM/test_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.1.1/STORM/test_service_check.py
@@ -36,7 +36,7 @@ class TestStormServiceCheck(RMFTestCase):
     self.assertResourceCalled('File', '/tmp/wordCount.jar',
       content = StaticFile('wordCount.jar'),
     )
-    self.assertResourceCalled('Execute', 'env PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin storm
jar /tmp/wordCount.jar storm.starter.WordCountTopology WordCount -c nimbus.host=c6402.ambari.apache.org',
+    self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 storm jar
/tmp/wordCount.jar storm.starter.WordCountTopology WordCount -c nimbus.host=c6402.ambari.apache.org',
       logoutput = True,
     )
     self.assertResourceCalled('Execute', 'env PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin storm
kill WordCount')


Mime
View raw message