Return-Path: 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 12E8172AA for ; Fri, 28 Oct 2011 22:56:39 +0000 (UTC) Received: (qmail 31329 invoked by uid 500); 28 Oct 2011 22:56:39 -0000 Delivered-To: apmail-incubator-bigtop-commits-archive@incubator.apache.org Received: (qmail 31297 invoked by uid 500); 28 Oct 2011 22:56:39 -0000 Mailing-List: contact bigtop-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: bigtop-dev@incubator.apache.org Delivered-To: mailing list bigtop-commits@incubator.apache.org Received: (qmail 31289 invoked by uid 99); 28 Oct 2011 22:56:38 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Oct 2011 22:56:38 +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; Fri, 28 Oct 2011 22:56:35 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 851BF2388A9C; Fri, 28 Oct 2011 22:56:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1190654 - in /incubator/bigtop/trunk/bigtop-packages/src: common/zookeeper/hadoop-zookeeper.sh common/zookeeper/hadoop-zookeeper.sh.suse common/zookeeper/install_zookeeper.sh deb/zookeeper/hadoop-zookeeper-server.init Date: Fri, 28 Oct 2011 22:56:14 -0000 To: bigtop-commits@incubator.apache.org From: rvs@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111028225614.851BF2388A9C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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/