You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ma...@apache.org on 2014/04/12 23:55:35 UTC
git commit: AMBARI-5451. Add logging to storm scripts for capturing
out/err . (mahadev)
Repository: ambari
Updated Branches:
refs/heads/branch-1.5.1 fe1730153 -> 797faab75
AMBARI-5451. Add logging to storm scripts for capturing out/err . (mahadev)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/797faab7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/797faab7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/797faab7
Branch: refs/heads/branch-1.5.1
Commit: 797faab758981ba33aa8faef577b054dac3d45a8
Parents: fe17301
Author: Mahadev Konar <ma...@apache.org>
Authored: Sat Apr 12 14:55:27 2014 -0700
Committer: Mahadev Konar <ma...@apache.org>
Committed: Sat Apr 12 14:55:27 2014 -0700
----------------------------------------------------------------------
.../stacks/HDP/2.1/services/STORM/package/scripts/service.py | 2 +-
.../test/python/stacks/2.1/STORM/test_storm_drpc_server.py | 4 ++--
.../src/test/python/stacks/2.1/STORM/test_storm_nimbus.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 | 4 ++--
6 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/797faab7/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 b6c040e..464f62e 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
@@ -50,7 +50,7 @@ def service(
if name == "rest_api":
cmd = format("{process_cmd} {rest_api_conf_file} > {log_dir}/restapi.log")
else:
- cmd = format("env JAVA_HOME={java64_home} PATH=$PATH:{java64_home}/bin /usr/bin/storm {name}")
+ cmd = format("env JAVA_HOME={java64_home} PATH=$PATH:{java64_home}/bin /usr/bin/storm {name} > {log_dir}/{name}.out 2>&1")
Execute(cmd,
not_if=no_op_test,
http://git-wip-us.apache.org/repos/asf/ambari/blob/797faab7/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 e2617b1..0e1be2b 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
@@ -43,7 +43,7 @@ class TestStormDrpcServer(RMFTestCase):
self.assert_configure_default()
- self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm drpc',
+ self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm drpc > /var/log/storm/drpc.out 2>&1',
wait_for_finish = False,
not_if = 'ls /var/run/storm/drpc.pid >/dev/null 2>&1 && ps `cat /var/run/storm/drpc.pid` >/dev/null 2>&1',
user = 'storm',
@@ -92,7 +92,7 @@ class TestStormDrpcServer(RMFTestCase):
self.assert_configure_secured()
- self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm drpc',
+ self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm drpc > /var/log/storm/drpc.out 2>&1',
wait_for_finish = False,
not_if = 'ls /var/run/storm/drpc.pid >/dev/null 2>&1 && ps `cat /var/run/storm/drpc.pid` >/dev/null 2>&1',
user = 'storm',
http://git-wip-us.apache.org/repos/asf/ambari/blob/797faab7/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 00b81ce..36f6b06 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
@@ -43,7 +43,7 @@ class TestStormNimbus(RMFTestCase):
self.assert_configure_default()
- self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm nimbus',
+ self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm nimbus > /var/log/storm/nimbus.out 2>&1',
wait_for_finish = False,
not_if = 'ls /var/run/storm/nimbus.pid >/dev/null 2>&1 && ps `cat /var/run/storm/nimbus.pid` >/dev/null 2>&1',
user = 'storm',
@@ -92,7 +92,7 @@ class TestStormNimbus(RMFTestCase):
self.assert_configure_secured()
- self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm nimbus',
+ self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm nimbus > /var/log/storm/nimbus.out 2>&1',
wait_for_finish = False,
not_if = 'ls /var/run/storm/nimbus.pid >/dev/null 2>&1 && ps `cat /var/run/storm/nimbus.pid` >/dev/null 2>&1',
user = 'storm',
http://git-wip-us.apache.org/repos/asf/ambari/blob/797faab7/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 8ebe10e..e391678 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
@@ -43,7 +43,7 @@ class TestStormSupervisor(RMFTestCase):
self.assert_configure_default()
- self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm supervisor',
+ self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm supervisor > /var/log/storm/supervisor.out 2>&1',
wait_for_finish = False,
not_if = 'ls /var/run/storm/supervisor.pid >/dev/null 2>&1 && ps `cat /var/run/storm/supervisor.pid` >/dev/null 2>&1',
user = 'storm',
@@ -55,7 +55,7 @@ class TestStormSupervisor(RMFTestCase):
user = 'storm',
try_sleep = 10,
)
- self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm logviewer',
+ self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm logviewer > /var/log/storm/logviewer.out 2>&1',
wait_for_finish = False,
not_if = 'ls /var/run/storm/logviewer.pid >/dev/null 2>&1 && ps `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1',
user = 'storm'
@@ -112,7 +112,7 @@ class TestStormSupervisor(RMFTestCase):
self.assert_configure_secured()
- self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm supervisor',
+ self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm supervisor > /var/log/storm/supervisor.out 2>&1',
wait_for_finish = False,
not_if = 'ls /var/run/storm/supervisor.pid >/dev/null 2>&1 && ps `cat /var/run/storm/supervisor.pid` >/dev/null 2>&1',
user = 'storm',
@@ -124,7 +124,7 @@ class TestStormSupervisor(RMFTestCase):
user = 'storm',
try_sleep = 10,
)
- self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm logviewer',
+ self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm logviewer > /var/log/storm/logviewer.out 2>&1',
wait_for_finish = False,
not_if = 'ls /var/run/storm/logviewer.pid >/dev/null 2>&1 && ps `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1',
user = 'storm'
http://git-wip-us.apache.org/repos/asf/ambari/blob/797faab7/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 b3df2c5..6837a01 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
@@ -46,7 +46,7 @@ class TestStormSupervisor(RMFTestCase):
self.assertResourceCalled('Execute', 'supervisorctl start storm-supervisor',
wait_for_finish = False,
)
- self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm logviewer',
+ self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm logviewer > /var/log/storm/logviewer.out 2>&1',
wait_for_finish = False,
not_if = 'ls /var/run/storm/logviewer.pid >/dev/null 2>&1 && ps `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1',
user = 'storm',
@@ -102,7 +102,7 @@ class TestStormSupervisor(RMFTestCase):
self.assertResourceCalled('Execute', 'supervisorctl start storm-supervisor',
wait_for_finish = False,
)
- self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm logviewer',
+ self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm logviewer > /var/log/storm/logviewer.out 2>&1',
wait_for_finish = False,
not_if = 'ls /var/run/storm/logviewer.pid >/dev/null 2>&1 && ps `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1',
user = 'storm',
http://git-wip-us.apache.org/repos/asf/ambari/blob/797faab7/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 a9732fe..d58e94c 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
@@ -43,7 +43,7 @@ class TestStormUiServer(RMFTestCase):
self.assert_configure_default()
- self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm ui',
+ self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm ui > /var/log/storm/ui.out 2>&1',
wait_for_finish = False,
not_if = 'ls /var/run/storm/ui.pid >/dev/null 2>&1 && ps `cat /var/run/storm/ui.pid` >/dev/null 2>&1',
user = 'storm',
@@ -92,7 +92,7 @@ class TestStormUiServer(RMFTestCase):
self.assert_configure_secured()
- self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm ui',
+ self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 PATH=$PATH:/usr/jdk64/jdk1.7.0_45/bin /usr/bin/storm ui > /var/log/storm/ui.out 2>&1',
wait_for_finish = False,
not_if = 'ls /var/run/storm/ui.pid >/dev/null 2>&1 && ps `cat /var/run/storm/ui.pid` >/dev/null 2>&1',
user = 'storm',