Return-Path: 
 <bigtop-commits-return-963-apmail-incubator-bigtop-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-bigtop-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-bigtop-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id B50669685
	for <apmail-incubator-bigtop-commits-archive@minotaur.apache.org>;
 Thu, 19 Apr 2012 00:02:21 +0000 (UTC)
Received: (qmail 96539 invoked by uid 500); 19 Apr 2012 00:02:21 -0000
Delivered-To: apmail-incubator-bigtop-commits-archive@incubator.apache.org
Received: (qmail 96485 invoked by uid 500); 19 Apr 2012 00:02:21 -0000
Mailing-List: contact bigtop-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:bigtop-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:bigtop-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:bigtop-commits@incubator.apache.org>
List-Id: <bigtop-commits.incubator.apache.org>
Reply-To: bigtop-dev@incubator.apache.org
Delivered-To: mailing list bigtop-commits@incubator.apache.org
Received: (qmail 96477 invoked by uid 99); 19 Apr 2012 00:02:21 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Apr 2012 00:02:21 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Apr 2012 00:02:14 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 35DD52388865;
	Thu, 19 Apr 2012 00:01:54 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1327751 - in
 /incubator/bigtop/trunk/bigtop-packages/src:
 common/zookeeper/install_zookeeper.sh rpm/zookeeper/SPECS/zookeeper.spec
Date: Thu, 19 Apr 2012 00:01:54 -0000
To: bigtop-commits@incubator.apache.org
From: rvs@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120419000154.35DD52388865@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: rvs
Date: Thu Apr 19 00:01:53 2012
New Revision: 1327751

URL: http://svn.apache.org/viewvc?rev=1327751&view=rev
Log:
BIGTOP-544. zookeeper-server init doesn't work

Modified:
    incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/install_zookeeper.sh
    incubator/bigtop/trunk/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec

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=1327751&r1=1327750&r2=1327751&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 Thu Apr 19 00:01:53 2012
@@ -121,8 +121,10 @@ ln -s $CONF_DIR $PREFIX/$LIB_DIR/conf
 
 # Copy in the /usr/bin/zookeeper-server wrapper
 install -d -m 0755 $PREFIX/$LIB_DIR/bin
+# FIXME: a workaround in preparation for Zookeeper 3.5
+echo '#!/bin/bash' > $BUILD_DIR/bin/zkServer-initialize.sh
 
-for i in zkServer.sh zkEnv.sh zkCli.sh zkCleanup.sh
+for i in zkServer.sh zkEnv.sh zkCli.sh zkCleanup.sh zkServer-initialize.sh
 	do cp $BUILD_DIR/bin/$i $PREFIX/$LIB_DIR/bin
 	chmod 755 $PREFIX/$LIB_DIR/bin/$i
 done
@@ -147,8 +149,9 @@ env CLASSPATH=\$CLASSPATH /usr/lib/zooke
 EOF
 chmod 755 $wrapper
 
-wrapper=$PREFIX/usr/bin/zookeeper-server
-cat > $wrapper <<EOF
+for bin_wrapper in zookeeper-server zookeeper-server-initialize ; do
+  wrapper=$PREFIX/usr/bin/$bin_wrapper
+  cat > $wrapper <<EOF
 #!/bin/sh
 
 # Autodetect JAVA_HOME if not defined
@@ -166,9 +169,11 @@ export CLASSPATH=\$CLASSPATH:\$ZOOKEEPER
 export ZOO_LOG_DIR=/var/log/zookeeper
 export ZOO_LOG4J_PROP=INFO,ROLLINGFILE
 export JVMFLAGS=-Dzookeeper.log.threshold=INFO
-env CLASSPATH=\$CLASSPATH /usr/lib/zookeeper/bin/zkServer.sh "\$@"
+export ZOO_DATADIR_AUTOCREATE_DISABLE=true
+env CLASSPATH=\$CLASSPATH /usr/lib/zookeeper/bin/zkServer${bin_wrapper#zookeeper-server}.sh "\$@"
 EOF
-chmod 755 $wrapper
+  chmod 755 $wrapper
+done
 
 # Copy in the docs
 install -d -m 0755 $PREFIX/$DOC_DIR

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=1327751&r1=1327750&r2=1327751&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 Thu Apr 19 00:01:53 2012
@@ -151,7 +151,7 @@ chmod 755 $init_file
 
 %pre
 getent group zookeeper >/dev/null || groupadd -r zookeeper
-getent passwd zookeeper > /dev/null || useradd -c "ZooKeeper" -s /sbin/nologin -g zookeeper -r -d %{run_zookeeper} zookeeper 2> /dev/null || :
+getent passwd zookeeper > /dev/null || useradd -c "ZooKeeper" -s /sbin/nologin -g zookeeper -r -d %{vlb_zookeeper} zookeeper 2> /dev/null || :
 
 %__install -d -o zookeeper -g zookeeper -m 0755 %{run_zookeeper}
 %__install -d -o zookeeper -g zookeeper -m 0755 %{log_zookeeper}
@@ -191,6 +191,7 @@ fi
 %config(noreplace) %{etc_zookeeper}/conf.dist
 %{lib_zookeeper}
 %{bin_zookeeper}/zookeeper-server
+%{bin_zookeeper}/zookeeper-server-initialize
 %{bin_zookeeper}/zookeeper-client
 %doc %{doc_zookeeper}
 %{man_dir}/man1/zookeeper.1.*