Repository: ambari Updated Branches: refs/heads/trunk 97cf296c9 -> bc5047acb
AMBARI-9992 Could not start Storm after Ambari only upgrade from 1.5.1 to 2.0.0 (dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bc5047ac Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bc5047ac Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bc5047ac Branch: refs/heads/trunk Commit: bc5047acbeb3895d12e248ed8ba04fb058a06654 Parents: 97cf296 Author: Dmytro Sen <[email protected]> Authored: Tue Mar 10 22:02:47 2015 +0200 Committer: Dmytro Sen <[email protected]> Committed: Tue Mar 10 22:02:47 2015 +0200 ---------------------------------------------------------------------- .../STORM/0.9.1.2.1/package/scripts/service.py | 2 +- .../test/python/stacks/2.1/STORM/test_storm_drpc_server.py | 6 +++--- .../src/test/python/stacks/2.1/STORM/test_storm_nimbus.py | 4 ++-- .../python/stacks/2.1/STORM/test_storm_rest_api_service.py | 4 ++-- .../test/python/stacks/2.1/STORM/test_storm_supervisor.py | 8 ++++---- .../python/stacks/2.1/STORM/test_storm_supervisor_prod.py | 4 ++-- .../src/test/python/stacks/2.1/STORM/test_storm_ui_server.py | 6 +++--- 7 files changed, 17 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/bc5047ac/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/service.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/service.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/service.py index 3e7d34b..901aecc 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/service.py +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/service.py @@ -49,7 +49,7 @@ def service( find_proc = format("{jps_binary} -l | grep {process_grep}") write_pid = format("{find_proc} | awk {{'print $1'}} > {pid_file}") crt_pid_cmd = format("{find_proc} && {write_pid}") - storm_env = format("source {conf_dir}/storm-env.sh ; export PATH=$PATH:$JAVA_HOME/bin") + storm_env = format("source {conf_dir}/storm-env.sh ; export PATH=$JAVA_HOME/bin:$PATH") if action == "start": if name == "rest_api": http://git-wip-us.apache.org/repos/asf/ambari/blob/bc5047ac/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py index d5afb42..b4fef75 100644 --- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py +++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py @@ -48,7 +48,7 @@ class TestStormDrpcServer(TestStormBase): ) self.assert_configure_default() - self.assertResourceCalled('Execute', 'source /etc/storm/conf/storm-env.sh ; export PATH=$PATH:$JAVA_HOME/bin ; storm drpc > /var/log/storm/drpc.out 2>&1', + self.assertResourceCalled('Execute', 'source /etc/storm/conf/storm-env.sh ; export PATH=$JAVA_HOME/bin:$PATH ; storm drpc > /var/log/storm/drpc.out 2>&1', wait_for_finish = False, path = ['/usr/bin'], user = 'storm', @@ -106,7 +106,7 @@ class TestStormDrpcServer(TestStormBase): self.assert_configure_secured() - self.assertResourceCalled('Execute', 'source /etc/storm/conf/storm-env.sh ; export PATH=$PATH:$JAVA_HOME/bin ; storm drpc > /var/log/storm/drpc.out 2>&1', + self.assertResourceCalled('Execute', 'source /etc/storm/conf/storm-env.sh ; export PATH=$JAVA_HOME/bin:$PATH ; storm drpc > /var/log/storm/drpc.out 2>&1', wait_for_finish = False, path = ['/usr/bin'], user = 'storm', @@ -253,4 +253,4 @@ class TestStormDrpcServer(TestStormBase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) - put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) \ No newline at end of file + put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) http://git-wip-us.apache.org/repos/asf/ambari/blob/bc5047ac/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py index 3ef45ad..b3f60d9 100644 --- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py +++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py @@ -48,7 +48,7 @@ class TestStormNimbus(TestStormBase): self.assert_configure_default() - self.assertResourceCalled('Execute', 'source /etc/storm/conf/storm-env.sh ; export PATH=$PATH:$JAVA_HOME/bin ; storm nimbus > /var/log/storm/nimbus.out 2>&1', + self.assertResourceCalled('Execute', 'source /etc/storm/conf/storm-env.sh ; export PATH=$JAVA_HOME/bin:$PATH ; storm nimbus > /var/log/storm/nimbus.out 2>&1', wait_for_finish = False, path = ['/usr/bin'], user = 'storm', @@ -105,7 +105,7 @@ class TestStormNimbus(TestStormBase): self.assert_configure_secured() - self.assertResourceCalled('Execute', 'source /etc/storm/conf/storm-env.sh ; export PATH=$PATH:$JAVA_HOME/bin ; storm nimbus > /var/log/storm/nimbus.out 2>&1', + self.assertResourceCalled('Execute', 'source /etc/storm/conf/storm-env.sh ; export PATH=$JAVA_HOME/bin:$PATH ; storm nimbus > /var/log/storm/nimbus.out 2>&1', wait_for_finish = False, path = ['/usr/bin'], user = 'storm', http://git-wip-us.apache.org/repos/asf/ambari/blob/bc5047ac/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_rest_api_service.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_rest_api_service.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_rest_api_service.py index 64a4662..e283c33 100644 --- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_rest_api_service.py +++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_rest_api_service.py @@ -48,7 +48,7 @@ class TestStormRestApi(TestStormBase): self.assert_configure_default() - self.assertResourceCalled('Execute', 'source /etc/storm/conf/storm-env.sh ; export PATH=$PATH:$JAVA_HOME/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 2>&1', + self.assertResourceCalled('Execute', 'source /etc/storm/conf/storm-env.sh ; export PATH=$JAVA_HOME/bin:$PATH ; 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 2>&1', wait_for_finish = False, path = ['/usr/bin'], user = 'storm', @@ -105,7 +105,7 @@ class TestStormRestApi(TestStormBase): self.assert_configure_secured() - self.assertResourceCalled('Execute', 'source /etc/storm/conf/storm-env.sh ; export PATH=$PATH:$JAVA_HOME/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 2>&1', + self.assertResourceCalled('Execute', 'source /etc/storm/conf/storm-env.sh ; export PATH=$JAVA_HOME/bin:$PATH ; 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 2>&1', wait_for_finish = False, path = ['/usr/bin'], user = 'storm', http://git-wip-us.apache.org/repos/asf/ambari/blob/bc5047ac/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py index 26089fb..4c172da 100644 --- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py +++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py @@ -47,7 +47,7 @@ class TestStormSupervisor(TestStormBase): self.assert_configure_default() - self.assertResourceCalled('Execute', 'source /etc/storm/conf/storm-env.sh ; export PATH=$PATH:$JAVA_HOME/bin ; storm supervisor > /var/log/storm/supervisor.out 2>&1', + self.assertResourceCalled('Execute', 'source /etc/storm/conf/storm-env.sh ; export PATH=$JAVA_HOME/bin:$PATH ; storm supervisor > /var/log/storm/supervisor.out 2>&1', wait_for_finish = False, path = ['/usr/bin'], user = 'storm', @@ -60,7 +60,7 @@ class TestStormSupervisor(TestStormBase): user = 'storm', try_sleep = 10, ) - self.assertResourceCalled('Execute', 'source /etc/storm/conf/storm-env.sh ; export PATH=$PATH:$JAVA_HOME/bin ; storm logviewer > /var/log/storm/logviewer.out 2>&1', + self.assertResourceCalled('Execute', 'source /etc/storm/conf/storm-env.sh ; export PATH=$JAVA_HOME/bin:$PATH ; storm logviewer > /var/log/storm/logviewer.out 2>&1', wait_for_finish = False, path = ['/usr/bin'], user = 'storm', @@ -127,7 +127,7 @@ class TestStormSupervisor(TestStormBase): self.assert_configure_secured() - self.assertResourceCalled('Execute', 'source /etc/storm/conf/storm-env.sh ; export PATH=$PATH:$JAVA_HOME/bin ; storm supervisor > /var/log/storm/supervisor.out 2>&1', + self.assertResourceCalled('Execute', 'source /etc/storm/conf/storm-env.sh ; export PATH=$JAVA_HOME/bin:$PATH ; storm supervisor > /var/log/storm/supervisor.out 2>&1', wait_for_finish = False, path = ['/usr/bin'], user = 'storm', @@ -140,7 +140,7 @@ class TestStormSupervisor(TestStormBase): user = 'storm', try_sleep = 10, ) - self.assertResourceCalled('Execute', 'source /etc/storm/conf/storm-env.sh ; export PATH=$PATH:$JAVA_HOME/bin ; storm logviewer > /var/log/storm/logviewer.out 2>&1', + self.assertResourceCalled('Execute', 'source /etc/storm/conf/storm-env.sh ; export PATH=$JAVA_HOME/bin:$PATH ; storm logviewer > /var/log/storm/logviewer.out 2>&1', wait_for_finish = False, path = ['/usr/bin'], user = 'storm', http://git-wip-us.apache.org/repos/asf/ambari/blob/bc5047ac/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor_prod.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor_prod.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor_prod.py index 549c5fc..583d1fc 100644 --- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor_prod.py +++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor_prod.py @@ -50,7 +50,7 @@ class TestStormSupervisor(TestStormBase): self.assertResourceCalled('Execute', 'supervisorctl start storm-supervisor', wait_for_finish = False, ) - self.assertResourceCalled('Execute', 'source /etc/storm/conf/storm-env.sh ; export PATH=$PATH:$JAVA_HOME/bin ; storm logviewer > /var/log/storm/logviewer.out 2>&1', + self.assertResourceCalled('Execute', 'source /etc/storm/conf/storm-env.sh ; export PATH=$JAVA_HOME/bin:$PATH ; storm logviewer > /var/log/storm/logviewer.out 2>&1', wait_for_finish = False, path = ['/usr/bin'], user = 'storm', @@ -113,7 +113,7 @@ class TestStormSupervisor(TestStormBase): self.assertResourceCalled('Execute', 'supervisorctl start storm-supervisor', wait_for_finish = False, ) - self.assertResourceCalled('Execute', 'source /etc/storm/conf/storm-env.sh ; export PATH=$PATH:$JAVA_HOME/bin ; storm logviewer > /var/log/storm/logviewer.out 2>&1', + self.assertResourceCalled('Execute', 'source /etc/storm/conf/storm-env.sh ; export PATH=$JAVA_HOME/bin:$PATH ; storm logviewer > /var/log/storm/logviewer.out 2>&1', wait_for_finish = False, path = ['/usr/bin'], user = 'storm', http://git-wip-us.apache.org/repos/asf/ambari/blob/bc5047ac/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_ui_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_ui_server.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_ui_server.py index d23114a..49b27fa 100644 --- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_ui_server.py +++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_ui_server.py @@ -46,7 +46,7 @@ class TestStormUiServer(TestStormBase): self.assert_configure_default() - self.assertResourceCalled('Execute', 'source /etc/storm/conf/storm-env.sh ; export PATH=$PATH:$JAVA_HOME/bin ; storm ui > /var/log/storm/ui.out 2>&1', + self.assertResourceCalled('Execute', 'source /etc/storm/conf/storm-env.sh ; export PATH=$JAVA_HOME/bin:$PATH ; storm ui > /var/log/storm/ui.out 2>&1', wait_for_finish = False, path = ['/usr/bin'], user = 'storm', @@ -103,7 +103,7 @@ class TestStormUiServer(TestStormBase): self.assert_configure_secured() - self.assertResourceCalled('Execute', 'source /etc/storm/conf/storm-env.sh ; export PATH=$PATH:$JAVA_HOME/bin ; storm ui > /var/log/storm/ui.out 2>&1', + self.assertResourceCalled('Execute', 'source /etc/storm/conf/storm-env.sh ; export PATH=$JAVA_HOME/bin:$PATH ; storm ui > /var/log/storm/ui.out 2>&1', wait_for_finish = False, path = ['/usr/bin'], user = 'storm', @@ -227,4 +227,4 @@ class TestStormUiServer(TestStormBase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) - put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) \ No newline at end of file + put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"})
