You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2013/02/10 07:04:01 UTC
[17/50] [abbrv] git commit: BIGTOP-791. Bump Oozie to 3.3.0
BIGTOP-791. Bump Oozie to 3.3.0
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/55426cd9
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/55426cd9
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/55426cd9
Branch: refs/heads/RCs
Commit: 55426cd95bc953c1caa7361aa744b459ac45af41
Parents: 9d15f3d
Author: Roman Shaposhnik <rv...@apache.org>
Authored: Wed Nov 21 08:12:09 2012 -0800
Committer: Roman Shaposhnik <rv...@cloudera.com>
Committed: Tue Dec 4 08:49:21 2012 -0800
----------------------------------------------------------------------
.../modules/hadoop-oozie/templates/oozie-site.xml | 20 ++++-
.../src/common/oozie/do-component-build | 4 +-
bigtop-packages/src/common/oozie/install_oozie.sh | 63 +++-----------
bigtop-packages/src/deb/oozie/rules | 2 +-
bigtop.mk | 4 +-
5 files changed, 36 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/55426cd9/bigtop-deploy/puppet/modules/hadoop-oozie/templates/oozie-site.xml
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/modules/hadoop-oozie/templates/oozie-site.xml b/bigtop-deploy/puppet/modules/hadoop-oozie/templates/oozie-site.xml
index 860b531..3fdcf95 100644
--- a/bigtop-deploy/puppet/modules/hadoop-oozie/templates/oozie-site.xml
+++ b/bigtop-deploy/puppet/modules/hadoop-oozie/templates/oozie-site.xml
@@ -22,6 +22,12 @@
Refer to the oozie-default.xml file for the complete list of
Oozie configuration properties and their default values.
-->
+
+ <!-- FIXME: OOZIE-1089, MAPREDUCE-4820 -->
+ <property>
+ <name>oozie.hadoop-2.0.2-alpha.workaround.for.distributed.cache</name>
+ <value>true</value>
+ </property>
<property>
<name>oozie.service.ActionService.executor.ext.classes</name>
@@ -29,13 +35,14 @@
org.apache.oozie.action.email.EmailActionExecutor,
org.apache.oozie.action.hadoop.HiveActionExecutor,
org.apache.oozie.action.hadoop.ShellActionExecutor,
- org.apache.oozie.action.hadoop.SqoopActionExecutor
+ org.apache.oozie.action.hadoop.SqoopActionExecutor,
+ org.apache.oozie.action.hadoop.DistcpActionExecutor
</value>
</property>
<property>
<name>oozie.service.SchemaService.wf.ext.schemas</name>
- <value>shell-action-0.1.xsd,email-action-0.1.xsd,hive-action-0.2.xsd,sqoop-action-0.2.xsd,ssh-action-0.1.xsd</value>
+ <value>shell-action-0.1.xsd,shell-action-0.2.xsd,email-action-0.1.xsd,hive-action-0.2.xsd,hive-action-0.3.xsd,sqoop-action-0.2.xsd,sqoop-action-0.3.xsd,ssh-action-0.1.xsd,distcp-action-0.1.xsd</value>
</property>
<property>
@@ -321,6 +328,15 @@
</description>
</property>
+ <property>
+ <name>oozie.authentication.kerberos.name.rules</name>
+ <value>DEFAULT</value>
+ <description>
+ The kerberos names rules is to resolve kerberos principal names, refer to Hadoop's
+ KerberosName for more details.
+ </description>
+ </property>
+
<!-- Proxyuser Configuration -->
<!--
http://git-wip-us.apache.org/repos/asf/bigtop/blob/55426cd9/bigtop-packages/src/common/oozie/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/oozie/do-component-build b/bigtop-packages/src/common/oozie/do-component-build
index 03c5cce..808d985 100755
--- a/bigtop-packages/src/common/oozie/do-component-build
+++ b/bigtop-packages/src/common/oozie/do-component-build
@@ -86,9 +86,7 @@ if [ "${DO_MAVEN_DEPLOY}" = "deploy" ]; then
EXTRA_GOALS="${EXTRA_GOALS} source:jar deploy"
fi
-# Invoke Oozie build script with CDH options
-# FIXME: the following need to go away once we transition to 3.3.X
-HADOOP_VERSION=0.23.1
+# Invoke Oozie build script
${WORKDIR}/bin/mkdistro.sh -DskipTests -Dhadoop.version=${HADOOP_VERSION} ${EXTRA_GOALS} -Dmaven.repo.local=${HOME}/.m2/repository "$@"
MKDISTRO_RESULT=$?
if [ "${MKDISTRO_RESULT}" != "0" ]; then
http://git-wip-us.apache.org/repos/asf/bigtop/blob/55426cd9/bigtop-packages/src/common/oozie/install_oozie.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/oozie/install_oozie.sh b/bigtop-packages/src/common/oozie/install_oozie.sh
index 6b4a4c9..a762419 100755
--- a/bigtop-packages/src/common/oozie/install_oozie.sh
+++ b/bigtop-packages/src/common/oozie/install_oozie.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+set -x
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -16,12 +17,6 @@
# limitations under the License.
#
-failIfNotOK() {
- if [ $? != 0 ]; then
- exit $?
- fi
-}
-
usage() {
echo "
usage: $0 <options>
@@ -107,37 +102,22 @@ DOC_DIR=${DOC_DIR:-$CLIENT_PREFIX/usr/share/doc/oozie}
BIN_DIR=${CLIENT_PREFIX}/usr/bin
install -d -m 0755 ${CLIENT_LIB_DIR}
-failIfNotOK
install -d -m 0755 ${CLIENT_LIB_DIR}/bin
-failIfNotOK
cp -R ${BUILD_DIR}/bin/oozie ${CLIENT_LIB_DIR}/bin
-failIfNotOK
cp -R ${BUILD_DIR}/lib ${CLIENT_LIB_DIR}
-failIfNotOK
install -d -m 0755 ${DOC_DIR}
-failIfNotOK
cp -R ${BUILD_DIR}/LICENSE.txt ${DOC_DIR}
-failIfNotOK
cp -R ${BUILD_DIR}/NOTICE.txt ${DOC_DIR}
-failIfNotOK
cp -R ${BUILD_DIR}/oozie-examples.tar.gz ${DOC_DIR}
-failIfNotOK
cp -R ${BUILD_DIR}/README.txt ${DOC_DIR}
-failIfNotOK
cp -R ${BUILD_DIR}/release-log.txt ${DOC_DIR}
-failIfNotOK
[ -f ${BUILD_DIR}/PATCH.txt ] && cp ${BUILD_DIR}/PATCH.txt ${DOC_DIR}
-# failIfNotOK
cp -R ${BUILD_DIR}/docs/* ${DOC_DIR}
-failIfNotOK
install -d -m 0755 ${MAN_DIR}
-failIfNotOK
gzip -c ${EXTRA_DIR}/oozie.1 > ${MAN_DIR}/oozie.1.gz
-failIfNotOK
# Create the /usr/bin/oozie wrapper
install -d -m 0755 $BIN_DIR
-failIfNotOK
cat > ${BIN_DIR}/oozie <<EOF
#!/bin/sh
#
@@ -165,9 +145,7 @@ fi
exec /usr/lib/oozie/bin/oozie "\$@"
EOF
-failIfNotOK
chmod 755 ${BIN_DIR}/oozie
-failIfNotOK
## Install server image
@@ -176,67 +154,54 @@ CONF_DIR=${CONF_DIR:-"${SERVER_PREFIX}/etc/oozie/conf.dist"}
DATA_DIR=${SERVER_PREFIX}/var/lib/oozie
install -d -m 0755 ${SERVER_LIB_DIR}
-failIfNotOK
install -d -m 0755 ${SERVER_LIB_DIR}/bin
-failIfNotOK
install -d -m 0755 ${DATA_DIR}
-failIfNotOK
for file in ooziedb.sh oozied.sh oozie-sys.sh ; do
cp ${BUILD_DIR}/bin/$file ${SERVER_LIB_DIR}/bin
- failIfNotOK
done
-cp -R ${BUILD_DIR}/libtools ${SERVER_LIB_DIR}
-failIfNotOK
install -d -m 0755 ${CONF_DIR}
-failIfNotOK
cp ${BUILD_DIR}/conf/* ${CONF_DIR}
sed -i -e '/oozie.service.HadoopAccessorService.hadoop.configurations/,/<\/property>/s#<value>\*=hadoop-conf</value>#<value>*=/etc/hadoop/conf</value>#g' \
${CONF_DIR}/oozie-site.xml
-failIfNotOK
+# FIXME: OOZIE-1089, MAPREDUCE-4820
+sed -i -e '/<\/configuration>/i<property><name>oozie.hadoop-2.0.2-alpha.workaround.for.distributed.cache</name><value>true</value></property>' \
+ ${CONF_DIR}/oozie-site.xml
cp ${EXTRA_DIR}/oozie-env.sh ${CONF_DIR}
-failIfNotOK
install -d -m 0755 ${CONF_DIR}/action-conf
-failIfNotOK
cp ${EXTRA_DIR}/hive.xml ${CONF_DIR}/action-conf
-failIfNotOK
if [ "${INITD_DIR}" != "" ]; then
install -d -m 0755 ${INITD_DIR}
- failIfNotOK
cp -R ${EXTRA_DIR}/oozie.init ${INITD_DIR}/oozie
- failIfNotOK
chmod 755 ${INITD_DIR}/oozie
- failIfNotOK
fi
cp -R ${BUILD_DIR}/oozie-sharelib*.tar.gz ${SERVER_LIB_DIR}/oozie-sharelib.tar.gz
-failIfNotOK
cp -R ${BUILD_DIR}/oozie-server/webapps ${SERVER_LIB_DIR}/webapps
-failIfNotOK
ln -s -f /etc/oozie/conf/oozie-env.sh ${SERVER_LIB_DIR}/bin
-failIfNotOK
# Unpack oozie.war some place reasonable
WEBAPP_DIR=${SERVER_LIB_DIR}/webapps/oozie
mkdir ${WEBAPP_DIR}
-failIfNotOK
(cd ${WEBAPP_DIR} ; jar xf ${BUILD_DIR}/oozie.war)
-failIfNotOK
mv -f ${WEBAPP_DIR}/WEB-INF/lib ${SERVER_LIB_DIR}/libserver
-failIfNotOK
touch ${SERVER_LIB_DIR}/webapps/oozie.war
-failIfNotOK
+
+# Create all the jars needed for tools execution
+install -d -m 0755 ${SERVER_LIB_DIR}/libtools
+for i in `cd ${BUILD_DIR}/libtools ; ls *` ; do
+ if [ -e ${SERVER_LIB_DIR}/libserver/$i ] ; then
+ ln -s ../libserver/$i ${SERVER_LIB_DIR}/libtools/$i
+ else
+ cp ${BUILD_DIR}/libtools/$i ${SERVER_LIB_DIR}/libtools/$i
+ fi
+done
# Create an exploded-war oozie deployment in /var/lib/oozie
install -d -m 0755 ${SERVER_LIB_DIR}/oozie-server
-failIfNotOK
cp -R ${BUILD_DIR}/oozie-server/conf ${SERVER_LIB_DIR}/oozie-server/conf
-failIfNotOK
cp ${EXTRA_DIR}/context.xml ${SERVER_LIB_DIR}/oozie-server/conf/
-failIfNotOK
cp ${EXTRA_DIR}/catalina.properties ${SERVER_LIB_DIR}/oozie-server/conf/
-failIfNotOK
ln -s ../webapps ${SERVER_LIB_DIR}/oozie-server/webapps
-failIfNotOK
# Provide a convenience symlink to be more consistent with tarball deployment
ln -s ${DATA_DIR#${SERVER_PREFIX}} ${SERVER_LIB_DIR}/libext
http://git-wip-us.apache.org/repos/asf/bigtop/blob/55426cd9/bigtop-packages/src/deb/oozie/rules
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/oozie/rules b/bigtop-packages/src/deb/oozie/rules
index 9d6604f..531aeb2 100755
--- a/bigtop-packages/src/deb/oozie/rules
+++ b/bigtop-packages/src/deb/oozie/rules
@@ -36,7 +36,7 @@ override_dh_auto_build:
tar cf - --exclude=debian/\* . | (cd debian/tmp && tar xf -)
override_dh_auto_install:
- sh -x debian/install_oozie.sh --extra-dir=debian/ --build-dir=. --server-dir=./debian/oozie --client-dir=./debian/oozie-client --docs-dir=./debian/oozie-client/usr/share/doc/oozie --initd-dir=./debian/oozie/etc/init.d --conf-dir=./debian/oozie/etc/oozie/conf.dist
+ sh -x debian/install_oozie.sh --extra-dir=debian/ --build-dir=$(PWD) --server-dir=./debian/oozie --client-dir=./debian/oozie-client --docs-dir=./debian/oozie-client/usr/share/doc/oozie --initd-dir=./debian/oozie/etc/init.d --conf-dir=./debian/oozie/etc/oozie/conf.dist
ln -s -f /var/lib/oozie/ext-2.2 debian/oozie/usr/lib/oozie/webapps/oozie/ext-2.2
rm -rf debian/oozie/usr/lib/oozie/webapps/oozie/docs
ln -s -f /usr/share/doc/oozie debian/oozie/usr/lib/oozie/webapps/oozie/docs
http://git-wip-us.apache.org/repos/asf/bigtop/blob/55426cd9/bigtop.mk
----------------------------------------------------------------------
diff --git a/bigtop.mk b/bigtop.mk
index e8bebe7..f59437e 100644
--- a/bigtop.mk
+++ b/bigtop.mk
@@ -102,8 +102,8 @@ $(eval $(call PACKAGE,sqoop,SQOOP))
OOZIE_NAME=oozie
OOZIE_RELNOTES_NAME=Apache Oozie
OOZIE_PKG_NAME=oozie
-OOZIE_BASE_VERSION=3.2.0-incubating
-OOZIE_PKG_VERSION=3.2.0
+OOZIE_BASE_VERSION=3.3.0
+OOZIE_PKG_VERSION=3.3.0
OOZIE_RELEASE_VERSION=1
OOZIE_TARBALL_DST=oozie-$(OOZIE_BASE_VERSION).tar.gz
OOZIE_TARBALL_SRC=$(OOZIE_TARBALL_DST)