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 2011/11/28 22:04:27 UTC
svn commit: r1207607 - in /incubator/bigtop/trunk: ./
bigtop-packages/src/common/zookeeper/ bigtop-packages/src/deb/zookeeper/
bigtop-packages/src/rpm/zookeeper/SPECS/
Author: rvs
Date: Mon Nov 28 21:04:23 2011
New Revision: 1207607
URL: http://svn.apache.org/viewvc?rev=1207607&view=rev
Log:
BIGTOP-157. add support for ZooKeeper version 3.4.0
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/hadoop-zookeeper.sh
incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/hadoop-zookeeper.sh.suse
incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/install_zookeeper.sh
incubator/bigtop/trunk/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper-server.init
incubator/bigtop/trunk/bigtop-packages/src/deb/zookeeper/rules
incubator/bigtop/trunk/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec
incubator/bigtop/trunk/bigtop.mk
Modified: incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/hadoop-zookeeper.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/hadoop-zookeeper.sh?rev=1207607&r1=1207606&r2=1207607&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/hadoop-zookeeper.sh (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/hadoop-zookeeper.sh Mon Nov 28 21:04:23 2011
@@ -43,8 +43,7 @@ DAEMON_SCRIPT="/usr/bin/zookeeper-server
NAME=hadoop-zookeeper-server
DESC="ZooKeeper daemon"
-# FIXME: a workaround for BIGTOP-207
-PID_FILE=/var/lib/zookeeper/zookeeper_server.pid
+PID_FILE=/var/run/zookeeper/zookeeper_server.pid
install -d -m 0755 -o zookeeper -g zookeeper /var/run/zookeeper/
DODTIME=3
@@ -121,8 +120,7 @@ hadoop_stop_pidfile() {
start() {
- # FIXME: nohup is a workaround for BIGTOP-205
- su -s /bin/sh zookeeper -c "nohup ${DAEMON_SCRIPT} start >/dev/null 2>&1 </dev/null"
+ su -s /bin/sh zookeeper -c "${DAEMON_SCRIPT} start"
}
stop() {
if hadoop_check_pidfile $PID_FILE ; then
Modified: incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/hadoop-zookeeper.sh.suse
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/hadoop-zookeeper.sh.suse?rev=1207607&r1=1207606&r2=1207607&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/hadoop-zookeeper.sh.suse (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/hadoop-zookeeper.sh.suse Mon Nov 28 21:04:23 2011
@@ -51,8 +51,7 @@ RETVAL=0
EXEC_PATH="/usr/bin/zookeeper-server"
NAME=hadoop-zookeeper-server
DESC="$NAME"
-# FIXME: a workaround for BIGTOP-207
-PIDFILE=/var/lib/zookeeper/zookeeper_server.pid
+PIDFILE=/var/run/zookeeper/zookeeper_server.pid
LOCKFILE="/var/lock/subsys/zookeeper"
USER=zookeeper
@@ -62,8 +61,7 @@ install -d -m 0755 -o zookeeper -g zooke
start() {
[ -x $exec ] || exit $ERROR_PROGRAM_NOT_INSTALLED
log_success_msg "Starting $DESC: "
- # FIXME: nohup is a workaround for BIGTOP-205
- start_daemon -u $USER nohup $EXEC_PATH start
+ start_daemon -u $USER $EXEC_PATH start
RETVAL=$?
echo
[ $RETVAL -eq 0 ] && touch $LOCKFILE
Modified: incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/install_zookeeper.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/install_zookeeper.sh?rev=1207607&r1=1207606&r2=1207607&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/install_zookeeper.sh (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/install_zookeeper.sh Mon Nov 28 21:04:23 2011
@@ -101,46 +101,29 @@ CONF_DIR=/etc/zookeeper/conf
CONF_DIST_DIR=/etc/zookeeper/conf.dist/
install -d -m 0755 $PREFIX/$LIB_DIR/
-rm build/zookeeper-*-javadoc.jar
-rm build/zookeeper-*-bin.jar
-rm build/zookeeper-*-sources.jar
-cp build/zookeeper*.jar $PREFIX/$LIB_DIR/
+rm -f $BUILD_DIR/zookeeper-*-javadoc.jar $BUILD_DIR/zookeeper-*-bin.jar $BUILD_DIR/zookeeper-*-sources.jar $BUILD_DIR/zookeeper-*-test.jar
+cp $BUILD_DIR/zookeeper*.jar $PREFIX/$LIB_DIR/
# Make a symlink of zookeeper.jar to zookeeper-version.jar
-for x in build/zookeeper*jar ; do
+for x in $PREFIX/$LIB_DIR/zookeeper*jar ; do
x=$(basename $x)
ln -s $x $PREFIX/$LIB_DIR/zookeeper.jar
done
install -d -m 0755 $PREFIX/$LIB_DIR/lib
-cp build/lib/*.jar $PREFIX/$LIB_DIR/lib
+cp $BUILD_DIR/lib/*.jar $PREFIX/$LIB_DIR/lib
# Copy in the configuration files
install -d -m 0755 $PREFIX/$CONF_DIST_DIR
-cp zoo.cfg conf/* $PREFIX/$CONF_DIST_DIR/
+cp zoo.cfg $BUILD_DIR/conf/* $PREFIX/$CONF_DIST_DIR/
ln -s $CONF_DIR $PREFIX/$LIB_DIR/conf
-# FIXME:
-cat << __EOT__ >> $PREFIX/$CONF_DIST_DIR/log4j.properties
-# Define some default values that can be overridden by system properties
-zookeeper.root.logger=INFO, CONSOLE
-zookeeper.console.threshold=INFO
-zookeeper.log.dir=.
-zookeeper.log.file=zookeeper.log
-zookeeper.log.threshold=DEBUG
-zookeeper.tracelog.dir=.
-zookeeper.tracelog.file=zookeeper_trace.log
-
-log4j.appender.ROLLINGFILE.File=\${zookeeper.log.dir}/\${zookeeper.log.file}
-log4j.rootLogger=\${zookeeper.root.logger}
-__EOT__
-
# Copy in the /usr/bin/zookeeper-server wrapper
install -d -m 0755 $PREFIX/$LIB_DIR/bin
for i in zkServer.sh zkEnv.sh zkCli.sh zkCleanup.sh
- do cp bin/$i $PREFIX/$LIB_DIR/bin
+ do cp $BUILD_DIR/bin/$i $PREFIX/$LIB_DIR/bin
chmod 755 $PREFIX/$LIB_DIR/bin/$i
done
@@ -190,7 +173,7 @@ chmod 755 $wrapper
# Copy in the docs
install -d -m 0755 $PREFIX/$DOC_DIR
cp -a $BUILD_DIR/docs/* $PREFIX/$DOC_DIR
-cp *.txt $PREFIX/$DOC_DIR/
+cp $BUILD_DIR/*.txt $PREFIX/$DOC_DIR/
install -d -m 0755 $MAN_DIR
gzip -c zookeeper.1 > $MAN_DIR/zookeeper.1.gz
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper-server.init
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper-server.init?rev=1207607&r1=1207606&r2=1207607&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper-server.init (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper-server.init Mon Nov 28 21:04:23 2011
@@ -36,8 +36,7 @@ DAEMON_SCRIPT="/usr/bin/zookeeper-server
NAME=hadoop-zookeeper-server
DESC="ZooKeeper daemon"
-# FIXME: a workaround for BIGTOP-207
-PID_FILE=/var/lib/zookeeper/zookeeper_server.pid
+PID_FILE=/var/run/zookeeper/zookeeper_server.pid
install -d -m 0755 -o zookeeper -g zookeeper /var/run/zookeeper/
@@ -114,8 +113,7 @@ hadoop_stop_pidfile() {
start() {
- # FIXME: nohup is a workaround for BIGTOP-205
- su -s /bin/sh zookeeper -c "nohup ${DAEMON_SCRIPT} start >/dev/null 2>&1 </dev/null"
+ su -s /bin/sh zookeeper -c "${DAEMON_SCRIPT} start"
}
stop() {
if hadoop_check_pidfile $PID_FILE ; then
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/zookeeper/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/zookeeper/rules?rev=1207607&r1=1207606&r2=1207607&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/zookeeper/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/zookeeper/rules Mon Nov 28 21:04:23 2011
@@ -48,7 +48,7 @@ install-indep:
dh_testroot
cp debian/zookeeper.1 debian/zoo.cfg .
sh -x debian/install_zookeeper.sh \
- --build-dir=. \
+ --build-dir=build/zookeeper-${ZOOKEEPER_BASE_VERSION} \
--prefix=debian/hadoop-zookeeper
dh_install -i
Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec?rev=1207607&r1=1207606&r2=1207607&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec Mon Nov 28 21:04:23 2011
@@ -129,7 +129,7 @@ bash %{SOURCE1} -Dversion=%{version}
%__rm -rf $RPM_BUILD_ROOT
cp $RPM_SOURCE_DIR/zookeeper.1 $RPM_SOURCE_DIR/zoo.cfg .
sh %{SOURCE2} \
- --build-dir=. \
+ --build-dir=build/zookeeper-%{zookeeper_version} \
--doc-dir=%{doc_zookeeper} \
--prefix=$RPM_BUILD_ROOT
Modified: incubator/bigtop/trunk/bigtop.mk
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop.mk?rev=1207607&r1=1207606&r2=1207607&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop.mk (original)
+++ incubator/bigtop/trunk/bigtop.mk Mon Nov 28 21:04:23 2011
@@ -30,12 +30,12 @@ $(eval $(call PACKAGE,hadoop,HADOOP))
ZOOKEEPER_NAME=zookeeper
ZOOKEEPER_RELNOTES_NAME=Apache Zookeeper
ZOOKEEPER_PKG_NAME=hadoop-zookeeper
-ZOOKEEPER_BASE_VERSION=3.3.3
-ZOOKEEPER_PKG_VERSION=3.3.3
+ZOOKEEPER_BASE_VERSION=3.4.0
+ZOOKEEPER_PKG_VERSION=3.4.0
ZOOKEEPER_RELEASE_VERSION=1
ZOOKEEPER_TARBALL_DST=zookeeper-$(ZOOKEEPER_BASE_VERSION).tar.gz
ZOOKEEPER_TARBALL_SRC=$(ZOOKEEPER_TARBALL_DST)
-ZOOKEEPER_SITE=$(APACHE_MIRROR)/zookeeper/zookeeper-3.3.3/
+ZOOKEEPER_SITE=$(APACHE_MIRROR)/zookeeper/zookeeper-3.4.0/
$(eval $(call PACKAGE,zookeeper,ZOOKEEPER))
# HBase