Repository: ambari Updated Branches: refs/heads/trunk 343d78c65 -> 81a0305df
AMBARI-5412. Operation "Supervisor start" failed during installation but all supervisors are alive.(vbrodetskyi) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/81a0305d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/81a0305d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/81a0305d Branch: refs/heads/trunk Commit: 81a0305dfd2f92051c83ed200b955eb2dad1ca36 Parents: 343d78c Author: Vitaly Brodetskyi <[email protected]> Authored: Wed Apr 9 20:27:04 2014 +0300 Committer: Vitaly Brodetskyi <[email protected]> Committed: Wed Apr 9 20:27:04 2014 +0300 ---------------------------------------------------------------------- .../stacks/HDP/2.1/services/STORM/package/scripts/service.py | 7 ++++++- .../src/test/python/stacks/2.1/STORM/test_storm_supervisor.py | 4 ++-- .../python/stacks/2.1/STORM/test_storm_supervisor_prod.py | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/81a0305d/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/package/scripts/service.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/package/scripts/service.py b/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/package/scripts/service.py index 5f9db49..b6c040e 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/package/scripts/service.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/package/scripts/service.py @@ -32,6 +32,11 @@ def service( pid_file = status_params.pid_files[name] no_op_test = format("ls {pid_file} >/dev/null 2>&1 && ps `cat {pid_file}` >/dev/null 2>&1") + if name == "logviewer": + tries_count = 12 + else: + tries_count = 6 + if name == 'ui': process_cmd = "^java.+backtype.storm.ui.core$" elif name == "rest_api": @@ -55,7 +60,7 @@ def service( Execute(crt_pid_cmd, user=params.storm_user, logoutput=True, - tries=6, + tries=tries_count, try_sleep=10 ) http://git-wip-us.apache.org/repos/asf/ambari/blob/81a0305d/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 070498d..240b39f 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 @@ -63,7 +63,7 @@ class TestStormSupervisor(RMFTestCase): self.assertResourceCalled('Execute', 'pgrep -f "^java.+backtype.storm.daemon.logviewer$" && pgrep -f "^java.+backtype.storm.daemon.logviewer$" > /var/run/storm/logviewer.pid', logoutput = True, - tries = 6, + tries = 12, user = 'storm', try_sleep = 10 ) @@ -132,7 +132,7 @@ class TestStormSupervisor(RMFTestCase): self.assertResourceCalled('Execute', 'pgrep -f "^java.+backtype.storm.daemon.logviewer$" && pgrep -f "^java.+backtype.storm.daemon.logviewer$" > /var/run/storm/logviewer.pid', logoutput = True, - tries = 6, + tries = 12, user = 'storm', try_sleep = 10 ) http://git-wip-us.apache.org/repos/asf/ambari/blob/81a0305d/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 91398e7..6e3639c 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 @@ -53,7 +53,7 @@ class TestStormSupervisor(RMFTestCase): ) self.assertResourceCalled('Execute', 'pgrep -f "^java.+backtype.storm.daemon.logviewer$" && pgrep -f "^java.+backtype.storm.daemon.logviewer$" > /var/run/storm/logviewer.pid', logoutput = True, - tries = 6, + tries = 12, user = 'storm', try_sleep = 10, ) @@ -109,7 +109,7 @@ class TestStormSupervisor(RMFTestCase): ) self.assertResourceCalled('Execute', 'pgrep -f "^java.+backtype.storm.daemon.logviewer$" && pgrep -f "^java.+backtype.storm.daemon.logviewer$" > /var/run/storm/logviewer.pid', logoutput = True, - tries = 6, + tries = 12, user = 'storm', try_sleep = 10, )
