You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ma...@apache.org on 2014/02/28 22:31:45 UTC
git commit: AMBARI-4892. Storm REST API Server eventually goes into
STOPPED state. (Arsen Babych vi mahadev)
Repository: ambari
Updated Branches:
refs/heads/trunk 78a0d5acd -> b79293137
AMBARI-4892. Storm REST API Server eventually goes into STOPPED state. (Arsen Babych vi mahadev)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b7929313
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b7929313
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b7929313
Branch: refs/heads/trunk
Commit: b79293137ac69791725bdf9e605eec0df1b99a3b
Parents: 78a0d5a
Author: Mahadev Konar <ma...@apache.org>
Authored: Fri Feb 28 13:31:20 2014 -0800
Committer: Mahadev Konar <ma...@apache.org>
Committed: Fri Feb 28 13:31:26 2014 -0800
----------------------------------------------------------------------
.../stacks/HDP/2.1.1/services/STORM/package/scripts/service.py | 2 +-
.../python/stacks/2.1.1/STORM/test_storm_rest_api_service.py | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b7929313/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/service.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/service.py b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/service.py
index 9aac08b..4afa818 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/service.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/service.py
@@ -44,7 +44,7 @@ def service(
if action == "start":
if name == "rest_api":
- cmd = format("env PATH=$PATH:{java64_home}/bin {process_cmd} {rest_api_conf_file} > {log_dir}/restapi.log")
+ cmd = format("env JAVA_HOME={java64_home} PATH=$PATH:{java64_home}/bin {process_cmd} {rest_api_conf_file} > {log_dir}/restapi.log")
else:
cmd = format("env JAVA_HOME={java64_home} PATH=$PATH:{java64_home}/bin /usr/bin/storm {name}")
http://git-wip-us.apache.org/repos/asf/ambari/blob/b7929313/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_rest_api_service.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_rest_api_service.py b/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_rest_api_service.py
index cd15196..6e05a8d 100644
--- a/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_rest_api_service.py
+++ b/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_rest_api_service.py
@@ -31,6 +31,7 @@ class TestStormRestApi(RMFTestCase):
command = "configure",
config_file="default.json"
)
+ self.printResources()
self.assert_configure_default()
self.assertNoMoreResources()
@@ -43,7 +44,7 @@ class TestStormRestApi(RMFTestCase):
self.assert_configure_default()
- self.assertResourceCalled('Execute', 'env PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin java -jar /usr/lib/storm/contrib/storm-rest/`ls /usr/lib/storm/contrib/storm-rest | grep -wE storm-rest-[0-9.-]+\\.jar` server /etc/storm/conf/config.yaml > /var/log/storm/restapi.log',
+ self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin java -jar /usr/lib/storm/contrib/storm-rest/`ls /usr/lib/storm/contrib/storm-rest | grep -wE storm-rest-[0-9.-]+\\.jar` server /etc/storm/conf/config.yaml > /var/log/storm/restapi.log',
wait_for_finish = False,
not_if = 'ls /var/run/storm/restapi.pid >/dev/null 2>&1 && ps `cat /var/run/storm/restapi.pid` >/dev/null 2>&1',
user = 'storm',
@@ -93,7 +94,7 @@ class TestStormRestApi(RMFTestCase):
self.assert_configure_secured()
- self.assertResourceCalled('Execute', 'env PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin java -jar /usr/lib/storm/contrib/storm-rest/`ls /usr/lib/storm/contrib/storm-rest | grep -wE storm-rest-[0-9.-]+\\.jar` server /etc/storm/conf/config.yaml > /var/log/storm/restapi.log',
+ self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin java -jar /usr/lib/storm/contrib/storm-rest/`ls /usr/lib/storm/contrib/storm-rest | grep -wE storm-rest-[0-9.-]+\\.jar` server /etc/storm/conf/config.yaml > /var/log/storm/restapi.log',
wait_for_finish = False,
not_if = 'ls /var/run/storm/restapi.pid >/dev/null 2>&1 && ps `cat /var/run/storm/restapi.pid` >/dev/null 2>&1',
user = 'storm',