Repository: ambari Updated Branches: refs/heads/trunk 9ed9f129b -> a3ddc89a1
AMBARI-4892. Storm REST API Server eventually goes into "STOPPED" state (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/a3ddc89a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a3ddc89a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a3ddc89a Branch: refs/heads/trunk Commit: a3ddc89a1361923121e30ca620278161fc1cfbec Parents: 9ed9f12 Author: Andrew Onischuk <[email protected]> Authored: Mon Mar 3 08:20:02 2014 -0800 Committer: Andrew Onischuk <[email protected]> Committed: Mon Mar 3 08:20:02 2014 -0800 ---------------------------------------------------------------------- .../HDP/2.1.1/services/STORM/package/scripts/service.py | 4 ++-- .../python/stacks/2.1.1/STORM/test_storm_rest_api_service.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a3ddc89a/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 4afa818..c44505c 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 @@ -36,7 +36,7 @@ def service( if name == 'ui': process_cmd = "^java.+backtype.storm.ui.core$" elif name == "rest_api": - process_cmd = format("java -jar {rest_lib_dir}/`ls {rest_lib_dir} | grep -wE storm-rest-[0-9.-]+\.jar` server") + process_cmd = format("{java64_home}/bin/java -jar {rest_lib_dir}/`ls {rest_lib_dir} | grep -wE storm-rest-[0-9.-]+\.jar` server") else: process_cmd = format("^java.+backtype.storm.daemon.{name}$") @@ -44,7 +44,7 @@ def service( if action == "start": if name == "rest_api": - cmd = format("env JAVA_HOME={java64_home} PATH=$PATH:{java64_home}/bin {process_cmd} {rest_api_conf_file} > {log_dir}/restapi.log") + cmd = format("{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/a3ddc89a/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 6e05a8d..7930abc 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 @@ -44,13 +44,13 @@ class TestStormRestApi(RMFTestCase): self.assert_configure_default() - 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', + self.assertResourceCalled('Execute', '/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', ) - self.assertResourceCalled('Execute', 'pgrep -f "java -jar /usr/lib/storm/contrib/storm-rest/`ls /usr/lib/storm/contrib/storm-rest | grep -wE storm-rest-[0-9.-]+\\.jar` server" && pgrep -f "java -jar /usr/lib/storm/contrib/storm-rest/`ls /usr/lib/storm/contrib/storm-rest | grep -wE storm-rest-[0-9.-]+\\.jar` server" > /var/run/storm/restapi.pid', + self.assertResourceCalled('Execute', 'pgrep -f "/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" && pgrep -f "/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" > /var/run/storm/restapi.pid', logoutput = True, tries = 6, user = 'storm', @@ -94,13 +94,13 @@ class TestStormRestApi(RMFTestCase): self.assert_configure_secured() - 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', + self.assertResourceCalled('Execute', '/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', ) - self.assertResourceCalled('Execute', 'pgrep -f "java -jar /usr/lib/storm/contrib/storm-rest/`ls /usr/lib/storm/contrib/storm-rest | grep -wE storm-rest-[0-9.-]+\\.jar` server" && pgrep -f "java -jar /usr/lib/storm/contrib/storm-rest/`ls /usr/lib/storm/contrib/storm-rest | grep -wE storm-rest-[0-9.-]+\\.jar` server" > /var/run/storm/restapi.pid', + self.assertResourceCalled('Execute', 'pgrep -f "/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" && pgrep -f "/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" > /var/run/storm/restapi.pid', logoutput = True, tries = 6, user = 'storm',
