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/02/28 18:10:58 UTC
git commit: AMBARI-4889. Storm components cannot be started after
failure (Iryna Kuzmenko via aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 1a66462b6 -> 91bdbc3b8
AMBARI-4889. Storm components cannot be started after failure (Iryna
Kuzmenko via aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/91bdbc3b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/91bdbc3b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/91bdbc3b
Branch: refs/heads/trunk
Commit: 91bdbc3b80c764ed069f2cb9dc461506cc609dfc
Parents: 1a66462
Author: Andrew Onischuk <ao...@hortonworks.com>
Authored: Fri Feb 28 09:01:21 2014 -0800
Committer: Andrew Onischuk <ao...@hortonworks.com>
Committed: Fri Feb 28 09:09:28 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 ++--
.../python/stacks/2.1.1/STORM/test_storm_rest_api_service.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 ++--
7 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/91bdbc3b/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 fea3e22..a77ebff 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
@@ -31,7 +31,7 @@ def service(
import status_params
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")
+ no_op_test = format("ls {pid_file} >/dev/null 2>&1 && test ! -z \"`cat {pid_file}`\" && ps `cat {pid_file}` >/dev/null 2>&1")
if name == 'ui':
process_cmd = "^java.+backtype.storm.ui.core$"
http://git-wip-us.apache.org/repos/asf/ambari/blob/91bdbc3b/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 49a6615..504df7e 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
@@ -49,7 +49,7 @@ class TestStormDrpcServer(RMFTestCase):
user = 'storm',
)
- self.assertResourceCalled('Execute', 'pgrep -f "^java.+backtype.storm.daemon.drpc$" > /var/run/storm/drpc.pid',
+ self.assertResourceCalled('Execute', 'pgrep -f "^java.+backtype.storm.daemon.drpc$" && pgrep -f "^java.+backtype.storm.daemon.drpc$" > /var/run/storm/drpc.pid',
logoutput = True,
tries = 6,
user = 'storm',
@@ -98,7 +98,7 @@ class TestStormDrpcServer(RMFTestCase):
user = 'storm',
)
- self.assertResourceCalled('Execute', 'pgrep -f "^java.+backtype.storm.daemon.drpc$" > /var/run/storm/drpc.pid',
+ self.assertResourceCalled('Execute', 'pgrep -f "^java.+backtype.storm.daemon.drpc$" && pgrep -f "^java.+backtype.storm.daemon.drpc$" > /var/run/storm/drpc.pid',
logoutput = True,
tries = 6,
user = 'storm',
http://git-wip-us.apache.org/repos/asf/ambari/blob/91bdbc3b/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 764ce6f..007064f 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
@@ -49,7 +49,7 @@ class TestStormLogviewerServer(RMFTestCase):
user = 'storm',
)
- self.assertResourceCalled('Execute', 'pgrep -f "^java.+backtype.storm.daemon.logviewer$" > /var/run/storm/logviewer.pid',
+ 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,
user = 'storm',
@@ -98,7 +98,7 @@ class TestStormLogviewerServer(RMFTestCase):
user = 'storm',
)
- self.assertResourceCalled('Execute', 'pgrep -f "^java.+backtype.storm.daemon.logviewer$" > /var/run/storm/logviewer.pid',
+ 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,
user = 'storm',
http://git-wip-us.apache.org/repos/asf/ambari/blob/91bdbc3b/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 61c2168..a32cc90 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
@@ -49,7 +49,7 @@ class TestStormNimbus(RMFTestCase):
user = 'storm',
)
- self.assertResourceCalled('Execute', 'pgrep -f "^java.+backtype.storm.daemon.nimbus$" > /var/run/storm/nimbus.pid',
+ self.assertResourceCalled('Execute', 'pgrep -f "^java.+backtype.storm.daemon.nimbus$" && pgrep -f "^java.+backtype.storm.daemon.nimbus$" > /var/run/storm/nimbus.pid',
logoutput = True,
tries = 6,
user = 'storm',
@@ -98,7 +98,7 @@ class TestStormNimbus(RMFTestCase):
user = 'storm',
)
- self.assertResourceCalled('Execute', 'pgrep -f "^java.+backtype.storm.daemon.nimbus$" > /var/run/storm/nimbus.pid',
+ self.assertResourceCalled('Execute', 'pgrep -f "^java.+backtype.storm.daemon.nimbus$" && pgrep -f "^java.+backtype.storm.daemon.nimbus$" > /var/run/storm/nimbus.pid',
logoutput = True,
tries = 6,
user = 'storm',
http://git-wip-us.apache.org/repos/asf/ambari/blob/91bdbc3b/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_rest_api_service.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_rest_api_service.py b/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_rest_api_service.py
index 3ef78b5..cd15196 100644
--- a/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_rest_api_service.py
+++ b/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_rest_api_service.py
@@ -49,7 +49,7 @@ class TestStormRestApi(RMFTestCase):
user = 'storm',
)
- self.assertResourceCalled('Execute', 'pgrep -f "java -jar /usr/lib/storm/contrib/storm-rest/`ls /usr/lib/storm/contrib/storm-rest | grep -wE storm-rest-[0-9.-]+\\.jar` server" > /var/run/storm/restapi.pid',
+ self.assertResourceCalled('Execute', 'pgrep -f "java -jar /usr/lib/storm/contrib/storm-rest/`ls /usr/lib/storm/contrib/storm-rest | grep -wE storm-rest-[0-9.-]+\\.jar` server" && pgrep -f "java -jar /usr/lib/storm/contrib/storm-rest/`ls /usr/lib/storm/contrib/storm-rest | grep -wE storm-rest-[0-9.-]+\\.jar` server" > /var/run/storm/restapi.pid',
logoutput = True,
tries = 6,
user = 'storm',
@@ -99,7 +99,7 @@ class TestStormRestApi(RMFTestCase):
user = 'storm',
)
- self.assertResourceCalled('Execute', 'pgrep -f "java -jar /usr/lib/storm/contrib/storm-rest/`ls /usr/lib/storm/contrib/storm-rest | grep -wE storm-rest-[0-9.-]+\\.jar` server" > /var/run/storm/restapi.pid',
+ self.assertResourceCalled('Execute', 'pgrep -f "java -jar /usr/lib/storm/contrib/storm-rest/`ls /usr/lib/storm/contrib/storm-rest | grep -wE storm-rest-[0-9.-]+\\.jar` server" && pgrep -f "java -jar /usr/lib/storm/contrib/storm-rest/`ls /usr/lib/storm/contrib/storm-rest | grep -wE storm-rest-[0-9.-]+\\.jar` server" > /var/run/storm/restapi.pid',
logoutput = True,
tries = 6,
user = 'storm',
http://git-wip-us.apache.org/repos/asf/ambari/blob/91bdbc3b/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 25f7486..c16f01d 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
@@ -49,7 +49,7 @@ class TestStormSupervisor(RMFTestCase):
user = 'storm',
)
- self.assertResourceCalled('Execute', 'pgrep -f "^java.+backtype.storm.daemon.supervisor$" > /var/run/storm/supervisor.pid',
+ self.assertResourceCalled('Execute', 'pgrep -f "^java.+backtype.storm.daemon.supervisor$" && pgrep -f "^java.+backtype.storm.daemon.supervisor$" > /var/run/storm/supervisor.pid',
logoutput = True,
tries = 6,
user = 'storm',
@@ -99,7 +99,7 @@ class TestStormSupervisor(RMFTestCase):
user = 'storm',
)
- self.assertResourceCalled('Execute', 'pgrep -f "^java.+backtype.storm.daemon.supervisor$" > /var/run/storm/supervisor.pid',
+ self.assertResourceCalled('Execute', 'pgrep -f "^java.+backtype.storm.daemon.supervisor$" && pgrep -f "^java.+backtype.storm.daemon.supervisor$" > /var/run/storm/supervisor.pid',
logoutput = True,
tries = 6,
user = 'storm',
http://git-wip-us.apache.org/repos/asf/ambari/blob/91bdbc3b/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 8a4f6e3..f63e250 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
@@ -49,7 +49,7 @@ class TestStormUiServer(RMFTestCase):
user = 'storm',
)
- self.assertResourceCalled('Execute', 'pgrep -f "^java.+backtype.storm.ui.core$" > /var/run/storm/ui.pid',
+ self.assertResourceCalled('Execute', 'pgrep -f "^java.+backtype.storm.ui.core$" && pgrep -f "^java.+backtype.storm.ui.core$" > /var/run/storm/ui.pid',
logoutput = True,
tries = 6,
user = 'storm',
@@ -99,7 +99,7 @@ class TestStormUiServer(RMFTestCase):
user = 'storm',
)
- self.assertResourceCalled('Execute', 'pgrep -f "^java.+backtype.storm.ui.core$" > /var/run/storm/ui.pid',
+ self.assertResourceCalled('Execute', 'pgrep -f "^java.+backtype.storm.ui.core$" && pgrep -f "^java.+backtype.storm.ui.core$" > /var/run/storm/ui.pid',
logoutput = True,
tries = 6,
user = 'storm',