Repository: bigtop Updated Branches: refs/heads/master 9310e2615 -> 28999618e
BIGTOP-1048. ZooKeeper installation use "zookeeper-server.pid" as default while ZooKeeper expects zookeeper_server.pid. (contributed by Jeffrey Zhong) Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/28999618 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/28999618 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/28999618 Branch: refs/heads/master Commit: 28999618e3cafa12d1c63c470f41aee3a1dafae0 Parents: 9310e26 Author: Sean Mackrory <[email protected]> Authored: Thu May 29 09:37:02 2014 -0600 Committer: Sean Mackrory <[email protected]> Committed: Thu May 29 09:37:21 2014 -0600 ---------------------------------------------------------------------- bigtop-packages/src/common/zookeeper/install_zookeeper.sh | 2 +- bigtop-packages/src/common/zookeeper/zookeeper-server.sh | 4 ++-- bigtop-packages/src/common/zookeeper/zookeeper-server.sh.suse | 2 +- bigtop-packages/src/common/zookeeper/zookeeper.1 | 2 +- bigtop-packages/src/deb/zookeeper/zookeeper-server.init | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/28999618/bigtop-packages/src/common/zookeeper/install_zookeeper.sh ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/zookeeper/install_zookeeper.sh b/bigtop-packages/src/common/zookeeper/install_zookeeper.sh index 0ad7712..8bd5073 100755 --- a/bigtop-packages/src/common/zookeeper/install_zookeeper.sh +++ b/bigtop-packages/src/common/zookeeper/install_zookeeper.sh @@ -148,7 +148,7 @@ for pairs in zkServer.sh/zookeeper-server zkServer-initialize.sh/zookeeper-serve # Autodetect JAVA_HOME if not defined . /usr/lib/bigtop-utils/bigtop-detect-javahome -export ZOOPIDFILE=\${ZOOPIDFILE:-/var/run/zookeeper/zookeeper-server.pid} +export ZOOPIDFILE=\${ZOOPIDFILE:-/var/run/zookeeper/zookeeper_server.pid} export ZOOKEEPER_HOME=\${ZOOKEEPER_CONF:-/usr/lib/zookeeper} export ZOOKEEPER_CONF=\${ZOOKEEPER_CONF:-/etc/zookeeper/conf} export ZOOCFGDIR=\${ZOOCFGDIR:-\$ZOOKEEPER_CONF} http://git-wip-us.apache.org/repos/asf/bigtop/blob/28999618/bigtop-packages/src/common/zookeeper/zookeeper-server.sh ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/zookeeper/zookeeper-server.sh b/bigtop-packages/src/common/zookeeper/zookeeper-server.sh index eff68d8..713a405 100755 --- a/bigtop-packages/src/common/zookeeper/zookeeper-server.sh +++ b/bigtop-packages/src/common/zookeeper/zookeeper-server.sh @@ -18,7 +18,7 @@ # chkconfig: 2345 80 20 # description: Summary: ZooKeeper is a centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services. All of these kinds of services are used in some form or another by distributed applications. Each time they are implemented there is a lot of work that goes into fixing the bugs and race conditions that are inevitable. Because of the difficulty of implementing these kinds of services, applications initially usually skimp on them ,which make them brittle in the presence of change and difficult to manage. Even when done correctly, different implementations of these services lead to management complexity when the applications are deployed. # processname: java -# pidfile: /var/run/zookeeper/zookeeper-server.pid +# pidfile: /var/run/zookeeper/zookeeper_server.pid ### BEGIN INIT INFO # Provides: zookeeper-server # Required-Start: $network $local_fs @@ -41,7 +41,7 @@ DAEMON_SCRIPT="/usr/bin/zookeeper-server" NAME=zookeeper-server DESC="ZooKeeper daemon" -PID_FILE=/var/run/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 http://git-wip-us.apache.org/repos/asf/bigtop/blob/28999618/bigtop-packages/src/common/zookeeper/zookeeper-server.sh.suse ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/zookeeper/zookeeper-server.sh.suse b/bigtop-packages/src/common/zookeeper/zookeeper-server.sh.suse index adb27d0..7f8e7c9 100644 --- a/bigtop-packages/src/common/zookeeper/zookeeper-server.sh.suse +++ b/bigtop-packages/src/common/zookeeper/zookeeper-server.sh.suse @@ -49,7 +49,7 @@ RETVAL=0 EXEC_PATH="/usr/bin/zookeeper-server" NAME=zookeeper-server DESC="$NAME" -PIDFILE=/var/run/zookeeper/zookeeper-server.pid +PIDFILE=/var/run/zookeeper/zookeeper_server.pid LOCKFILE="/var/lock/subsys/zookeeper" USER=zookeeper http://git-wip-us.apache.org/repos/asf/bigtop/blob/28999618/bigtop-packages/src/common/zookeeper/zookeeper.1 ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/zookeeper/zookeeper.1 b/bigtop-packages/src/common/zookeeper/zookeeper.1 index 5513f76..ff767c6 100644 --- a/bigtop-packages/src/common/zookeeper/zookeeper.1 +++ b/bigtop-packages/src/common/zookeeper/zookeeper.1 @@ -74,7 +74,7 @@ Alternate home directory. Default is /usr/lib/zookeeper. Alternate conf dir. Default is /etc/zookeeper/conf. .IP ZOOPIDFILE -Alternate server PID file. Default is /var/run/zookeeper/zookeeper-server.pid. +Alternate server PID file. Default is /var/run/zookeeper/zookeeper_server.pid. .SH COPYRIGHT Copyright (C) 2010-2012 The Apache Software Foundation. All rights reserved. http://git-wip-us.apache.org/repos/asf/bigtop/blob/28999618/bigtop-packages/src/deb/zookeeper/zookeeper-server.init ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/zookeeper/zookeeper-server.init b/bigtop-packages/src/deb/zookeeper/zookeeper-server.init index 6e12812..2c78285 100644 --- a/bigtop-packages/src/deb/zookeeper/zookeeper-server.init +++ b/bigtop-packages/src/deb/zookeeper/zookeeper-server.init @@ -18,7 +18,7 @@ # chkconfig: 2345 80 20 # description: Summary: ZooKeeper is a centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services. All of these kinds of services are used in some form or another by distributed applications. Each time they are implemented there is a lot of work that goes into fixing the bugs and race conditions that are inevitable. Because of the difficulty of implementing these kinds of services, applications initially usually skimp on them ,which make them brittle in the presence of change and difficult to manage. Even when done correctly, different implementations of these services lead to management complexity when the applications are deployed. # processname: java -# pidfile: /var/run/zookeeper/zookeeper-server.pid +# pidfile: /var/run/zookeeper/zookeeper_server.pid ### BEGIN INIT INFO # Provides: zookeeper-server # Required-Start: $network $local_fs @@ -41,7 +41,7 @@ DAEMON_SCRIPT="/usr/bin/zookeeper-server" NAME=zookeeper-server DESC="ZooKeeper daemon" -PID_FILE=/var/run/zookeeper/zookeeper-server.pid +PID_FILE=/var/run/zookeeper/zookeeper_server.pid install -d -m 0755 -o zookeeper -g zookeeper /var/run/zookeeper/
