Author: rvs
Date: Fri Oct 28 22:56:13 2011
New Revision: 1190654
URL: http://svn.apache.org/viewvc?rev=1190654&view=rev
Log:
BIGTOP-207. zookeeper doesn't allow for overriding the location of the PID file
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
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=1190654&r1=1190653&r2=1190654&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
Fri Oct 28 22:56:13 2011
@@ -43,7 +43,8 @@ DAEMON_SCRIPT="/usr/bin/zookeeper-server
NAME=hadoop-zookeeper-server
DESC="ZooKeeper daemon"
-PID_FILE=/var/run/zookeeper/zookeeper-server.pid
+# FIXME: a workaround for BIGTOP-207
+PID_FILE=/var/lib/zookeeper/zookeeper_server.pid
install -d -m 0755 -o zookeeper -g zookeeper /var/run/zookeeper/
DODTIME=3
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=1190654&r1=1190653&r2=1190654&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
Fri Oct 28 22:56:13 2011
@@ -51,7 +51,8 @@ RETVAL=0
EXEC_PATH="/usr/bin/zookeeper-server"
NAME=hadoop-zookeeper-server
DESC="$NAME"
-PIDFILE=/var/run/zookeeper/zookeeper-server.pid
+# FIXME: a workaround for BIGTOP-207
+PIDFILE=/var/lib/zookeeper/zookeeper_server.pid
LOCKFILE="/var/lock/subsys/zookeeper"
USER=zookeeper
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=1190654&r1=1190653&r2=1190654&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
Fri Oct 28 22:56:13 2011
@@ -132,6 +132,7 @@ 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__
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=1190654&r1=1190653&r2=1190654&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
Fri Oct 28 22:56:13 2011
@@ -36,7 +36,8 @@ DAEMON_SCRIPT="/usr/bin/zookeeper-server
NAME=hadoop-zookeeper-server
DESC="ZooKeeper daemon"
-PID_FILE=/var/run/zookeeper/zookeeper-server.pid
+# FIXME: a workaround for BIGTOP-207
+PID_FILE=/var/lib/zookeeper/zookeeper_server.pid
install -d -m 0755 -o zookeeper -g zookeeper /var/run/zookeeper/
