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/02/27 23:31:05 UTC
git commit: AMBARI-4870. Nimbus fails to start on install on centos
5.9. (Iryna Kuzmenko via mahadev)
Repository: ambari
Updated Branches:
refs/heads/trunk 9acbc1001 -> 895bf7995
AMBARI-4870. Nimbus fails to start on install on centos 5.9. (Iryna Kuzmenko via mahadev)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/895bf799
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/895bf799
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/895bf799
Branch: refs/heads/trunk
Commit: 895bf7995453e5db051c0efead21356e73a707b3
Parents: 9acbc10
Author: Mahadev Konar <ma...@apache.org>
Authored: Thu Feb 27 14:30:58 2014 -0800
Committer: Mahadev Konar <ma...@apache.org>
Committed: Thu Feb 27 14:30:58 2014 -0800
----------------------------------------------------------------------
.../stacks/HDP/2.1.1/services/STORM/package/scripts/service.py | 3 +--
.../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 ++--
.../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 ++--
6 files changed, 11 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/895bf799/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 5661458..8cdeff9 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
@@ -46,14 +46,13 @@ def service(
if name == "rest_api":
cmd = format("env PATH=$PATH:{java64_home}/bin {process_cmd} {rest_api_conf_file} > {log_dir}/restapi.log")
else:
- cmd = format("env PATH=$PATH:{java64_home}/bin /usr/bin/storm {name}")
+ cmd = format("env JAVA_HOME={java64_home} /usr/bin/storm {name}")
Execute(cmd,
not_if=no_op_test,
user=params.storm_user,
wait_for_finish=False
)
-
Execute(crt_pid_cmd,
user=params.storm_user,
logoutput=True,
http://git-wip-us.apache.org/repos/asf/ambari/blob/895bf799/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 ce9fe47..3160c88 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
@@ -43,7 +43,7 @@ class TestStormDrpcServer(RMFTestCase):
self.assert_configure_default()
- self.assertResourceCalled('Execute', 'env 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 /usr/bin/storm drpc',
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 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 /usr/bin/storm drpc',
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/895bf799/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 83486b1..37c53c3 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
@@ -43,7 +43,7 @@ class TestStormLogviewerServer(RMFTestCase):
self.assert_configure_default()
- self.assertResourceCalled('Execute', 'env 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 /usr/bin/storm logviewer',
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',
@@ -92,7 +92,7 @@ class TestStormLogviewerServer(RMFTestCase):
self.assert_configure_secured()
- self.assertResourceCalled('Execute', 'env 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 /usr/bin/storm logviewer',
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/895bf799/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 94f44f9..9060075 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
@@ -43,7 +43,7 @@ class TestStormNimbus(RMFTestCase):
self.assert_configure_default()
- self.assertResourceCalled('Execute', 'env 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 /usr/bin/storm nimbus',
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 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 /usr/bin/storm nimbus',
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/895bf799/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 70ac98a..9910c2b 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
@@ -43,7 +43,7 @@ class TestStormSupervisor(RMFTestCase):
self.assert_configure_default()
- self.assertResourceCalled('Execute', 'env 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 /usr/bin/storm supervisor',
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',
@@ -93,7 +93,7 @@ class TestStormSupervisor(RMFTestCase):
self.assert_configure_secured()
- self.assertResourceCalled('Execute', 'env 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 /usr/bin/storm supervisor',
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',
http://git-wip-us.apache.org/repos/asf/ambari/blob/895bf799/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 fa613aa..6268984 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
@@ -43,7 +43,7 @@ class TestStormUiServer(RMFTestCase):
self.assert_configure_default()
- self.assertResourceCalled('Execute', 'env 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 /usr/bin/storm ui',
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',
@@ -93,7 +93,7 @@ class TestStormUiServer(RMFTestCase):
self.assert_configure_secured()
- self.assertResourceCalled('Execute', 'env 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 /usr/bin/storm ui',
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',