You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2014/12/05 19:58:35 UTC
ambari git commit: AMBARI-8560. Storm fails to start after adding
service and restart attempts (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 4d783d809 -> 93ca85b54
AMBARI-8560. Storm fails to start after adding service and restart attempts (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/93ca85b5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/93ca85b5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/93ca85b5
Branch: refs/heads/trunk
Commit: 93ca85b54e0b38a764ccfe4290305de44d46c2ad
Parents: 4d783d8
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Fri Dec 5 20:58:25 2014 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Fri Dec 5 20:58:25 2014 +0200
----------------------------------------------------------------------
.../stacks/HDP/2.1/services/STORM/package/scripts/service.py | 2 +-
.../src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/93ca85b5/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 8064ab7..8ad4b36 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,7 +32,7 @@ def service(
pid_file = status_params.pid_files[name]
no_op_test = format("ls {pid_file} >/dev/null 2>&1 && ps -p `cat {pid_file}` >/dev/null 2>&1")
- if name == "logviewer":
+ if name == "logviewer" or name == "drpc":
tries_count = 12
else:
tries_count = 6
http://git-wip-us.apache.org/repos/asf/ambari/blob/93ca85b5/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 6c2f28d..d5512e3 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
@@ -53,7 +53,7 @@ class TestStormDrpcServer(TestStormBase):
self.assertResourceCalled('Execute', "/usr/jdk64/jdk1.7.0_45/bin/jps -l | grep storm.daemon.drpc$ && /usr/jdk64/jdk1.7.0_45/bin/jps -l | grep storm.daemon.drpc$ | awk {'print $1'} > /var/run/storm/drpc.pid",
logoutput = True,
path = ['/usr/bin'],
- tries = 6,
+ tries = 12,
user = 'storm',
try_sleep = 10,
)
@@ -103,7 +103,7 @@ class TestStormDrpcServer(TestStormBase):
self.assertResourceCalled('Execute', "/usr/jdk64/jdk1.7.0_45/bin/jps -l | grep storm.daemon.drpc$ && /usr/jdk64/jdk1.7.0_45/bin/jps -l | grep storm.daemon.drpc$ | awk {'print $1'} > /var/run/storm/drpc.pid",
logoutput = True,
path = ['/usr/bin'],
- tries = 6,
+ tries = 12,
user = 'storm',
try_sleep = 10,
)