ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject git commit: AMBARI-5226. Check STORM fails (aonishuk)
Date Wed, 26 Mar 2014 17:16:01 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 24639f05a -> 3898abd54


AMBARI-5226. Check STORM fails (aonishuk)


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

Branch: refs/heads/trunk
Commit: 3898abd547b163013fe35bc0aa3d213dd2f9e02f
Parents: 24639f0
Author: Andrew Onischuk <aonishuk@hortonworks.com>
Authored: Wed Mar 26 10:14:58 2014 -0700
Committer: Andrew Onischuk <aonishuk@hortonworks.com>
Committed: Wed Mar 26 10:14:58 2014 -0700

----------------------------------------------------------------------
 .../stacks/HDP/2.1/services/STORM/package/scripts/service_check.py | 2 +-
 .../src/test/python/stacks/2.1/STORM/test_service_check.py         | 2 +-
 ambari-server/src/test/python/unitTests.py                         | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/3898abd5/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/package/scripts/service_check.py
b/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/package/scripts/service_check.py
index 3fc62fb..50ddb31 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/package/scripts/service_check.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/package/scripts/service_check.py
@@ -38,7 +38,7 @@ class ServiceCheck(Script):
             logoutput=True
     )
 
-    Execute(format("env PATH=$PATH:{java64_home}/bin storm kill WordCount{unique}"))
+    Execute(format("env JAVA_HOME={java64_home} storm kill WordCount{unique}"))
 
 if __name__ == "__main__":
   ServiceCheck().execute()

http://git-wip-us.apache.org/repos/asf/ambari/blob/3898abd5/ambari-server/src/test/python/stacks/2.1/STORM/test_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_service_check.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_service_check.py
index a78b246..aa0ae05 100644
--- a/ambari-server/src/test/python/stacks/2.1/STORM/test_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_service_check.py
@@ -39,5 +39,5 @@ class TestStormServiceCheck(RMFTestCase):
     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')
+    self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 storm kill
WordCount')
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/3898abd5/ambari-server/src/test/python/unitTests.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/unitTests.py b/ambari-server/src/test/python/unitTests.py
index ebaa13a..8395217 100644
--- a/ambari-server/src/test/python/unitTests.py
+++ b/ambari-server/src/test/python/unitTests.py
@@ -116,6 +116,7 @@ def main():
   ambari_server_folder = get_parent_path(pwd,'ambari-server')
   ambari_agent_folder = os.path.join(ambari_server_folder,"../ambari-agent")
   ambari_common_folder = os.path.join(ambari_server_folder,"../ambari-common")
+  sys.path.append(ambari_common_folder + "/src/main/python")
   sys.path.append(ambari_common_folder + "/src/main/python/jinja2")
   sys.path.append(ambari_common_folder + "/src/main/python")
   sys.path.append(ambari_common_folder + "/src/test/python")


Mime
View raw message