Repository: ambari Updated Branches: refs/heads/branch-2.2 aae6acc69 -> ae3593018
AMBARI-14398. SUPERVISOR START failed post EU.(vbrodetskyi) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ae359301 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ae359301 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ae359301 Branch: refs/heads/branch-2.2 Commit: ae359301835601bc40d72d7820041aff9ff5e0b8 Parents: aae6acc Author: Vitaly Brodetskyi <vbrodets...@hortonworks.com> Authored: Tue Dec 22 12:21:12 2015 +0200 Committer: Vitaly Brodetskyi <vbrodets...@hortonworks.com> Committed: Tue Dec 22 12:21:12 2015 +0200 ---------------------------------------------------------------------- .../common-services/STORM/0.9.1.2.1/package/scripts/service.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 ++-- .../src/test/python/stacks/2.1/STORM/test_storm_supervisor.py | 4 ++-- .../src/test/python/stacks/2.1/STORM/test_storm_ui_server.py | 4 ++-- 5 files changed, 9 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/ae359301/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 7437ddf..0222d71 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 @@ -35,11 +35,7 @@ def service(name, action = 'start'): pid_file = status_params.pid_files[name] no_op_test = as_user(format( "ls {pid_file} >/dev/null 2>&1 && ps -p `cat {pid_file}` >/dev/null 2>&1"), user=params.storm_user) - - if name == "logviewer" or name == "drpc": - tries_count = 12 - else: - tries_count = 6 + tries_count = 12 if name == 'ui': process_grep = "backtype.storm.ui.core$" http://git-wip-us.apache.org/repos/asf/ambari/blob/ae359301/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 6aa1c12..ddd396c 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 @@ -58,7 +58,7 @@ class TestStormNimbus(TestStormBase): self.assertResourceCalled('Execute', "/usr/jdk64/jdk1.7.0_45/bin/jps -l | grep storm.daemon.nimbus$ && /usr/jdk64/jdk1.7.0_45/bin/jps -l | grep storm.daemon.nimbus$ | awk {'print $1'} > /var/run/storm/nimbus.pid", logoutput = True, path = ['/usr/bin'], - tries = 6, + tries = 12, user = 'storm', try_sleep = 10, ) @@ -118,7 +118,7 @@ class TestStormNimbus(TestStormBase): self.assertResourceCalled('Execute', "/usr/jdk64/jdk1.7.0_45/bin/jps -l | grep storm.daemon.nimbus$ && /usr/jdk64/jdk1.7.0_45/bin/jps -l | grep storm.daemon.nimbus$ | awk {'print $1'} > /var/run/storm/nimbus.pid", logoutput = True, path = ['/usr/bin'], - tries = 6, + tries = 12, user = 'storm', try_sleep = 10, ) http://git-wip-us.apache.org/repos/asf/ambari/blob/ae359301/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 5562e44..09f432a 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 @@ -59,7 +59,7 @@ class TestStormRestApi(TestStormBase): self.assertResourceCalled('Execute', "/usr/jdk64/jdk1.7.0_45/bin/jps -l | grep /usr/lib/storm/contrib/storm-rest/storm-rest-.*\\.jar$ && /usr/jdk64/jdk1.7.0_45/bin/jps -l | grep /usr/lib/storm/contrib/storm-rest/storm-rest-.*\\.jar$ | awk {'print $1'} > /var/run/storm/restapi.pid", logoutput = True, path = ['/usr/bin'], - tries = 6, + tries = 12, user = 'storm', try_sleep = 10, ) @@ -119,7 +119,7 @@ class TestStormRestApi(TestStormBase): self.assertResourceCalled('Execute', "/usr/jdk64/jdk1.7.0_45/bin/jps -l | grep /usr/lib/storm/contrib/storm-rest/storm-rest-.*\\.jar$ && /usr/jdk64/jdk1.7.0_45/bin/jps -l | grep /usr/lib/storm/contrib/storm-rest/storm-rest-.*\\.jar$ | awk {'print $1'} > /var/run/storm/restapi.pid", logoutput = True, path = ['/usr/bin'], - tries = 6, + tries = 12, user = 'storm', try_sleep = 10, ) http://git-wip-us.apache.org/repos/asf/ambari/blob/ae359301/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 97d4b07..486c8b0 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 @@ -58,7 +58,7 @@ class TestStormSupervisor(TestStormBase): self.assertResourceCalled('Execute', "/usr/jdk64/jdk1.7.0_45/bin/jps -l | grep storm.daemon.supervisor$ && /usr/jdk64/jdk1.7.0_45/bin/jps -l | grep storm.daemon.supervisor$ | awk {'print $1'} > /var/run/storm/supervisor.pid", logoutput = True, path = ['/usr/bin'], - tries = 6, + tries = 12, user = 'storm', try_sleep = 10, ) @@ -141,7 +141,7 @@ class TestStormSupervisor(TestStormBase): self.assertResourceCalled('Execute', "/usr/jdk64/jdk1.7.0_45/bin/jps -l | grep storm.daemon.supervisor$ && /usr/jdk64/jdk1.7.0_45/bin/jps -l | grep storm.daemon.supervisor$ | awk {'print $1'} > /var/run/storm/supervisor.pid", logoutput = True, path = ['/usr/bin'], - tries = 6, + tries = 12, user = 'storm', try_sleep = 10, ) http://git-wip-us.apache.org/repos/asf/ambari/blob/ae359301/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 80b2efd..128b53f 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 @@ -58,7 +58,7 @@ class TestStormUiServer(TestStormBase): self.assertResourceCalled('Execute', "/usr/jdk64/jdk1.7.0_45/bin/jps -l | grep backtype.storm.ui.core$ && /usr/jdk64/jdk1.7.0_45/bin/jps -l | grep backtype.storm.ui.core$ | awk {'print $1'} > /var/run/storm/ui.pid", logoutput = True, path = ['/usr/bin'], - tries = 6, + tries = 12, user = 'storm', try_sleep = 10, ) @@ -118,7 +118,7 @@ class TestStormUiServer(TestStormBase): self.assertResourceCalled('Execute', "/usr/jdk64/jdk1.7.0_45/bin/jps -l | grep backtype.storm.ui.core$ && /usr/jdk64/jdk1.7.0_45/bin/jps -l | grep backtype.storm.ui.core$ | awk {'print $1'} > /var/run/storm/ui.pid", logoutput = True, path = ['/usr/bin'], - tries = 6, + tries = 12, user = 'storm', try_sleep = 10, )