Pārlūkot izejas kodu

ZOOKEEPER-1074. zkServer.sh is missing nohup/sleep, which are necessary for remote invocation. (phunt via mahadev)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1140017 13f79535-47bb-0310-9956-ffa450edef68
Mahadev Konar 14 gadi atpakaļ
vecāks
revīzija
7f5105dd07
2 mainītis faili ar 5 papildinājumiem un 1 dzēšanām
  1. 3 0
      CHANGES.txt
  2. 2 1
      bin/zkServer.sh

+ 3 - 0
CHANGES.txt

@@ -322,6 +322,9 @@ IMPROVEMENTS:
 
   ZOOKEEPER-1094. Small improvements to LeaderElection and Vote classes (henryr via breed)
 
+  ZOOKEEPER-1074. zkServer.sh is missing nohup/sleep, which are necessary 
+  for remote invocation. (phunt via mahadev)
+
 NEW FEATURES:
   ZOOKEEPER-729. Java client API to recursively delete a subtree.
   (Kay Kay via henry)

+ 2 - 1
bin/zkServer.sh

@@ -102,12 +102,13 @@ start)
          exit 0
       fi
     fi
-    $JAVA "-Dzookeeper.log.dir=${ZOO_LOG_DIR}" "-Dzookeeper.root.logger=${ZOO_LOG4J_PROP}" \
+    nohup $JAVA "-Dzookeeper.log.dir=${ZOO_LOG_DIR}" "-Dzookeeper.root.logger=${ZOO_LOG4J_PROP}" \
     -cp "$CLASSPATH" $JVMFLAGS $ZOOMAIN "$ZOOCFG" > "$_ZOO_DAEMON_OUT" 2>&1 < /dev/null &
     if [ $? -eq 0 ]
     then
       if /bin/echo -n $! > "$ZOOPIDFILE"
       then
+        sleep 1
         echo STARTED
       else
         echo FAILED TO WRITE PID