Repository: ambari Updated Branches: refs/heads/trunk 0a7b75f0d -> 748b061a5
AMBARI-4888. All storm supervisors go down after storm service check (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/748b061a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/748b061a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/748b061a Branch: refs/heads/trunk Commit: 748b061a57e991bf377ef852e009908197f04767 Parents: 0a7b75f Author: Andrew Onischuk <[email protected]> Authored: Fri Feb 28 08:35:07 2014 -0800 Committer: Andrew Onischuk <[email protected]> Committed: Fri Feb 28 08:35:07 2014 -0800 ---------------------------------------------------------------------- .../stacks/HDP/2.1.1/services/STORM/package/scripts/service.py | 2 +- .../src/test/python/stacks/2.1.1/STORM/test_storm_drpc_server.py | 4 ++-- .../python/stacks/2.1.1/STORM/test_storm_logviewer_server.py | 4 ++-- .../src/test/python/stacks/2.1.1/STORM/test_storm_nimbus.py | 4 ++-- .../src/test/python/stacks/2.1.1/STORM/test_storm_supervisor.py | 4 ++-- .../src/test/python/stacks/2.1.1/STORM/test_storm_ui_server.py | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/748b061a/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 8cdeff9..fea3e22 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 @@ -46,7 +46,7 @@ def service( if name == "rest_api": cmd = format("env PATH=$PATH:{java64_home}/bin {process_cmd} {rest_api_conf_file} > {log_dir}/restapi.log") else: - cmd = format("env JAVA_HOME={java64_home} /usr/bin/storm {name}") + cmd = format("env JAVA_HOME={java64_home} PATH=$PATH:{java64_home}/bin /usr/bin/storm {name}") Execute(cmd, not_if=no_op_test, http://git-wip-us.apache.org/repos/asf/ambari/blob/748b061a/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_drpc_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_drpc_server.py b/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_drpc_server.py index 3160c88..49a6615 100644 --- a/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_drpc_server.py +++ b/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_drpc_server.py @@ -43,7 +43,7 @@ class TestStormDrpcServer(RMFTestCase): self.assert_configure_default() - self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/bin/storm drpc', + self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm drpc', wait_for_finish = False, not_if = 'ls /var/run/storm/drpc.pid >/dev/null 2>&1 && ps `cat /var/run/storm/drpc.pid` >/dev/null 2>&1', user = 'storm', @@ -92,7 +92,7 @@ class TestStormDrpcServer(RMFTestCase): self.assert_configure_secured() - self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/bin/storm drpc', + self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm drpc', wait_for_finish = False, not_if = 'ls /var/run/storm/drpc.pid >/dev/null 2>&1 && ps `cat /var/run/storm/drpc.pid` >/dev/null 2>&1', user = 'storm', http://git-wip-us.apache.org/repos/asf/ambari/blob/748b061a/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_logviewer_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_logviewer_server.py b/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_logviewer_server.py index 37c53c3..764ce6f 100644 --- a/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_logviewer_server.py +++ b/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_logviewer_server.py @@ -43,7 +43,7 @@ class TestStormLogviewerServer(RMFTestCase): self.assert_configure_default() - self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/bin/storm logviewer', + self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm logviewer', wait_for_finish = False, not_if = 'ls /var/run/storm/logviewer.pid >/dev/null 2>&1 && ps `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1', user = 'storm', @@ -92,7 +92,7 @@ class TestStormLogviewerServer(RMFTestCase): self.assert_configure_secured() - self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/bin/storm logviewer', + self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm logviewer', wait_for_finish = False, not_if = 'ls /var/run/storm/logviewer.pid >/dev/null 2>&1 && ps `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1', user = 'storm', http://git-wip-us.apache.org/repos/asf/ambari/blob/748b061a/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_nimbus.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_nimbus.py b/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_nimbus.py index 9060075..61c2168 100644 --- a/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_nimbus.py +++ b/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_nimbus.py @@ -43,7 +43,7 @@ class TestStormNimbus(RMFTestCase): self.assert_configure_default() - self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/bin/storm nimbus', + self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm nimbus', wait_for_finish = False, not_if = 'ls /var/run/storm/nimbus.pid >/dev/null 2>&1 && ps `cat /var/run/storm/nimbus.pid` >/dev/null 2>&1', user = 'storm', @@ -92,7 +92,7 @@ class TestStormNimbus(RMFTestCase): self.assert_configure_secured() - self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/bin/storm nimbus', + self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm nimbus', wait_for_finish = False, not_if = 'ls /var/run/storm/nimbus.pid >/dev/null 2>&1 && ps `cat /var/run/storm/nimbus.pid` >/dev/null 2>&1', user = 'storm', http://git-wip-us.apache.org/repos/asf/ambari/blob/748b061a/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_supervisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_supervisor.py b/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_supervisor.py index 9910c2b..25f7486 100644 --- a/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_supervisor.py +++ b/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_supervisor.py @@ -43,7 +43,7 @@ class TestStormSupervisor(RMFTestCase): self.assert_configure_default() - self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/bin/storm supervisor', + self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm supervisor', wait_for_finish = False, not_if = 'ls /var/run/storm/supervisor.pid >/dev/null 2>&1 && ps `cat /var/run/storm/supervisor.pid` >/dev/null 2>&1', user = 'storm', @@ -93,7 +93,7 @@ class TestStormSupervisor(RMFTestCase): self.assert_configure_secured() - self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/bin/storm supervisor', + self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm supervisor', wait_for_finish = False, not_if = 'ls /var/run/storm/supervisor.pid >/dev/null 2>&1 && ps `cat /var/run/storm/supervisor.pid` >/dev/null 2>&1', user = 'storm', http://git-wip-us.apache.org/repos/asf/ambari/blob/748b061a/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_ui_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_ui_server.py b/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_ui_server.py index 6268984..8a4f6e3 100644 --- a/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_ui_server.py +++ b/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_ui_server.py @@ -43,7 +43,7 @@ class TestStormUiServer(RMFTestCase): self.assert_configure_default() - self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/bin/storm ui', + self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm ui', wait_for_finish = False, not_if = 'ls /var/run/storm/ui.pid >/dev/null 2>&1 && ps `cat /var/run/storm/ui.pid` >/dev/null 2>&1', user = 'storm', @@ -93,7 +93,7 @@ class TestStormUiServer(RMFTestCase): self.assert_configure_secured() - self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/bin/storm ui', + self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm ui', wait_for_finish = False, not_if = 'ls /var/run/storm/ui.pid >/dev/null 2>&1 && ps `cat /var/run/storm/ui.pid` >/dev/null 2>&1', user = 'storm',
