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/04/14 21:15:18 UTC
[2/2] git commit: AMBARI-5468. "Oozie server" was failed or stopped
immediately, after start (sles/centos5) (aonishuk)
AMBARI-5468. "Oozie server" was failed or stopped immediately, after start (sles/centos5) (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c9b740a7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c9b740a7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c9b740a7
Branch: refs/heads/trunk
Commit: c9b740a7a4558a56e5bee98e8522de5475b2b26c
Parents: b740b57
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Mon Apr 14 22:08:52 2014 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Mon Apr 14 22:08:52 2014 +0300
----------------------------------------------------------------------
.../resources/stacks/HDP/1.3.2/services/HDFS/metainfo.xml | 4 ++--
.../HDP/1.3.2/services/OOZIE/package/scripts/params.py | 2 +-
.../1.3.2/services/OOZIE/package/templates/oozie-env.sh.j2 | 1 +
.../src/test/python/stacks/1.3.2/OOZIE/test_oozie_server.py | 8 ++++----
4 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c9b740a7/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/metainfo.xml
index f990385..cad0f55 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/metainfo.xml
@@ -108,11 +108,11 @@
</package>
<package>
<type>rpm</type>
- <name>hadoop-lzo</name>
+ <name>hadoop-lzo-0.5.0</name>
</package>
<package>
<type>rpm</type>
- <name>hadoop-lzo-native</name>
+ <name>hadoop-lzo-native-0.5.0</name>
</package>
<package>
<type>rpm</type>
http://git-wip-us.apache.org/repos/asf/ambari/blob/c9b740a7/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/package/scripts/params.py
index 6e04dea..bb6e27c 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/package/scripts/params.py
@@ -79,7 +79,7 @@ if lzo_enabled or jdbc_driver_name:
else:
jar_option = ""
-lzo_jar_suffix = '`find /usr/lib/hadoop/lib/ -name "hadoop-lzo-*"`' if lzo_enabled else ""
+lzo_jar_suffix = '`LZO_JARS=($(find /usr/lib/hadoop/lib/ -name "hadoop-lzo-*")); echo ${LZO_JARS[0]}`' if lzo_enabled else ""
if lzo_enabled and jdbc_driver_name:
jar_path = format("{lzo_jar_suffix}:{jdbc_driver_jar}")
http://git-wip-us.apache.org/repos/asf/ambari/blob/c9b740a7/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/package/templates/oozie-env.sh.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/package/templates/oozie-env.sh.j2 b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/package/templates/oozie-env.sh.j2
index 1617c9c..9a57108 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/package/templates/oozie-env.sh.j2
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/package/templates/oozie-env.sh.j2
@@ -38,6 +38,7 @@
#Set JAVA HOME
export JAVA_HOME={{java_home}}
+export JRE_HOME={{java_home}}
# Set Oozie specific environment variables here.
http://git-wip-us.apache.org/repos/asf/ambari/blob/c9b740a7/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_server.py b/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_server.py
index 2fd32e9..fffedc7 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_server.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_server.py
@@ -121,7 +121,7 @@ class TestOozieServer(RMFTestCase):
self.assertResourceCalled('Execute', 'cd /usr/lib/oozie && chown oozie:hadoop /var/tmp/oozie',
not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1',
)
- self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-setup.sh -hadoop 0.20.200 /usr/lib/hadoop/ -extjs /usr/share/HDP-oozie/ext.zip -jars `find /usr/lib/hadoop/lib/ -name "hadoop-lzo-*"`:',
+ self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-setup.sh -hadoop 0.20.200 /usr/lib/hadoop/ -extjs /usr/share/HDP-oozie/ext.zip -jars `LZO_JARS=($(find /usr/lib/hadoop/lib/ -name "hadoop-lzo-*")); echo ${LZO_JARS[0]}`:',
not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1',
user = 'oozie',
)
@@ -263,7 +263,7 @@ class TestOozieServer(RMFTestCase):
self.assertResourceCalled('Execute', 'cd /usr/lib/oozie && chown oozie:hadoop /var/tmp/oozie',
not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1',
)
- self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-setup.sh -hadoop 0.20.200 /usr/lib/hadoop/ -extjs /usr/share/HDP-oozie/ext.zip -jars `find /usr/lib/hadoop/lib/ -name "hadoop-lzo-*"`:',
+ self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-setup.sh -hadoop 0.20.200 /usr/lib/hadoop/ -extjs /usr/share/HDP-oozie/ext.zip -jars `LZO_JARS=($(find /usr/lib/hadoop/lib/ -name "hadoop-lzo-*")); echo ${LZO_JARS[0]}`:',
not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1',
user = 'oozie',
)
@@ -398,7 +398,7 @@ class TestOozieServer(RMFTestCase):
self.assertResourceCalled('Execute', 'cd /usr/lib/oozie && chown oozie:hadoop /var/tmp/oozie',
not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1',
)
- self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-setup.sh -hadoop 0.20.200 /usr/lib/hadoop/ -extjs /usr/share/HDP-oozie/ext.zip -jars `find /usr/lib/hadoop/lib/ -name "hadoop-lzo-*"`:',
+ self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-setup.sh -hadoop 0.20.200 /usr/lib/hadoop/ -extjs /usr/share/HDP-oozie/ext.zip -jars `LZO_JARS=($(find /usr/lib/hadoop/lib/ -name "hadoop-lzo-*")); echo ${LZO_JARS[0]}`:',
not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1',
user = 'oozie',
)
@@ -497,7 +497,7 @@ class TestOozieServer(RMFTestCase):
self.assertResourceCalled('Execute', 'cd /usr/lib/oozie && chown oozie:hadoop /var/tmp/oozie',
not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1',
)
- self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-setup.sh -hadoop 0.20.200 /usr/lib/hadoop/ -extjs /usr/share/HDP-oozie/ext.zip -jars `find /usr/lib/hadoop/lib/ -name "hadoop-lzo-*"`:',
+ self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-setup.sh -hadoop 0.20.200 /usr/lib/hadoop/ -extjs /usr/share/HDP-oozie/ext.zip -jars `LZO_JARS=($(find /usr/lib/hadoop/lib/ -name "hadoop-lzo-*")); echo ${LZO_JARS[0]}`:',
not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1',
user = 'oozie',
)
\ No newline at end of file