You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ph...@apache.org on 2012/03/18 07:49:54 UTC
svn commit: r1302070 - in /zookeeper/branches/branch-3.4: CHANGES.txt
src/packages/deb/init.d/zookeeper
Author: phunt
Date: Sun Mar 18 06:49:54 2012
New Revision: 1302070
URL: http://svn.apache.org/viewvc?rev=1302070&view=rev
Log:
ZOOKEEPER-1406. dpkg init scripts don't restart - missing check_priv_sep_dir (Chris Beauchamp via phunt)
Modified:
zookeeper/branches/branch-3.4/CHANGES.txt
zookeeper/branches/branch-3.4/src/packages/deb/init.d/zookeeper
Modified: zookeeper/branches/branch-3.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1302070&r1=1302069&r2=1302070&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.4/CHANGES.txt Sun Mar 18 06:49:54 2012
@@ -23,8 +23,12 @@ BUGFIXES:
ZOOKEEPER-1307. zkCli.sh is exiting when an Invalid ACL exception is
thrown from setACL command through client (Kavita Sharma via phunt)
- ZOOKEEPER-1390. some expensive debug code not protected by a check for debug (breed via camille)
+ ZOOKEEPER-1390. some expensive debug code not protected by a check
+ for debug (breed via camille)
+ ZOOKEEPER-1406. dpkg init scripts don't restart - missing
+ check_priv_sep_dir (Chris Beauchamp via phunt)
+
IMPROVEMENTS:
ZOOKEEPER-1389. it would be nice if start-foreground used exec $JAVA
Modified: zookeeper/branches/branch-3.4/src/packages/deb/init.d/zookeeper
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/packages/deb/init.d/zookeeper?rev=1302070&r1=1302069&r2=1302070&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/packages/deb/init.d/zookeeper (original)
+++ zookeeper/branches/branch-3.4/src/packages/deb/init.d/zookeeper Sun Mar 18 06:49:54 2012
@@ -34,7 +34,17 @@ umask 022
. /lib/lsb/init-functions
-ZOOPIDFILE=/var/lib/zookeeper/data/zookeeper_server.pid
+ZOOPIDDIR=/var/lib/zookeeper/data
+ZOOPIDFILE=${ZOOPIDDIR}/zookeeper_server.pid
+
+check_privsep_dir() {
+ # Create the PrivSep empty dir if necessary
+ if [ ! -d ${ZOOPIDDIR} ]; then
+ mkdir -p ${ZOOPIDDIR}
+ chown zookeeper:hadoop ${ZOOPIDDIR}
+ chmod 0775 ${ZOOPIDDIR}
+ fi
+}
# Are we running from init?
run_by_init() {
@@ -59,6 +69,7 @@ export PATH="${PATH:+$PATH:}/usr/sbin:/u
case "$1" in
start)
check_for_no_start
+ check_privsep_dir
log_daemon_msg "Starting Apache ZooKeeper server" "zookeeper"
if start-stop-daemon --start --quiet --oknodo --pidfile ${ZOOPIDFILE} -c zookeeper -x ${ZOOKEEPER_PREFIX}/sbin/zkServer.sh start; then
log_end_msg 0
@@ -80,7 +91,7 @@ case "$1" in
log_daemon_msg "Restarting Apache ZooKeeper server" "zookeeper"
start-stop-daemon --stop --quiet --oknodo --retry 30 --pidfile ${ZOOPIDFILE}
check_for_no_start log_end_msg
- if start-stop-daemon --start --quiet --oknodo --pidfile ${ZOOPIDFILE} -c zookeeper -x ${ZOOKEEPER_PREFIX}/bin/zkServer.sh start; then
+ if start-stop-daemon --start --quiet --oknodo --pidfile ${ZOOPIDFILE} -c zookeeper -x ${ZOOKEEPER_PREFIX}/sbin/zkServer.sh start; then
log_end_msg 0
else
log_end_msg 1
@@ -98,7 +109,7 @@ case "$1" in
0)
# old daemon stopped
check_for_no_start log_end_msg
- if start-stop-daemon --start --quiet --oknodo --pidfile ${ZOOPIDFILE} -c zookeeper -x ${ZOOKEEPER_PREFIX}/bin/zkServer.sh start; then
+ if start-stop-daemon --start --quiet --oknodo --pidfile ${ZOOPIDFILE} -c zookeeper -x ${ZOOKEEPER_PREFIX}/sbin/zkServer.sh start; then
log_end_msg 0
else
log_end_msg 1