You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2011/10/28 17:55:44 UTC

svn commit: r1190408 - in /incubator/bigtop/trunk/bigtop-packages/src: common/zookeeper/hadoop-zookeeper.sh common/zookeeper/hadoop-zookeeper.sh.suse deb/zookeeper/hadoop-zookeeper-server.init

Author: rvs
Date: Fri Oct 28 15:55:43 2011
New Revision: 1190408

URL: http://svn.apache.org/viewvc?rev=1190408&view=rev
Log:
BIGTOP-205. zookeeper-server doesn't do nohup before launching a damon

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/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=1190408&r1=1190407&r2=1190408&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 15:55:43 2011
@@ -120,7 +120,8 @@ hadoop_stop_pidfile() {
 
 
 start() {
-    su -s /bin/sh zookeeper -c "${DAEMON_SCRIPT} start"
+    # FIXME: nohup is a workaround for BIGTOP-205
+    su -s /bin/sh zookeeper -c "nohup ${DAEMON_SCRIPT} start >/dev/null 2>&1 </dev/null"
 }
 stop() {
 	if hadoop_check_pidfile $PID_FILE ;  then

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=1190408&r1=1190407&r2=1190408&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 15:55:43 2011
@@ -61,7 +61,8 @@ install -d -m 0755 -o zookeeper -g zooke
 start() {
   [ -x $exec ] || exit $ERROR_PROGRAM_NOT_INSTALLED
   log_success_msg "Starting $DESC: "
-  start_daemon -u $USER $EXEC_PATH start
+  # FIXME: nohup is a workaround for BIGTOP-205
+  start_daemon -u $USER nohup $EXEC_PATH start
   RETVAL=$?
   echo
   [ $RETVAL -eq 0 ] && touch $LOCKFILE

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=1190408&r1=1190407&r2=1190408&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 15:55:43 2011
@@ -113,7 +113,8 @@ hadoop_stop_pidfile() {
 
 
 start() {
-    su -s /bin/sh zookeeper -c "${DAEMON_SCRIPT} start"
+    # FIXME: nohup is a workaround for BIGTOP-205
+    su -s /bin/sh zookeeper -c "nohup ${DAEMON_SCRIPT} start >/dev/null 2>&1 </dev/null"
 }
 stop() {
 	if hadoop_check_pidfile $PID_FILE ;  then