Просмотр исходного кода

ZOOKEEPER-2948: Failing c unit tests on apache jenkins

Author: Abraham Fine <afine@apache.org>

Reviewers: phunt@apache.org

Closes #422 from afine/ZOOKEEPER-2948

Change-Id: I8d5d88d6b5863346dbb963f979ad9e6c9b33025c
Abraham Fine 7 лет назад
Родитель
Сommit
81fe5262fe
1 измененных файлов с 4 добавлено и 4 удалено
  1. 4 4
      src/c/tests/zkServer.sh

+ 4 - 4
src/c/tests/zkServer.sh

@@ -105,12 +105,12 @@ fi
 case $1 in
 case $1 in
 start|startClean)
 start|startClean)
     if [ "x${base_dir}" == "x" ]
     if [ "x${base_dir}" == "x" ]
-        then
+    then
         mkdir -p /tmp/zkdata
         mkdir -p /tmp/zkdata
         java -cp "$CLASSPATH" org.apache.zookeeper.server.ZooKeeperServerMain $ZOOPORT /tmp/zkdata 3000 $ZKMAXCNXNS &> /tmp/zk.log &
         java -cp "$CLASSPATH" org.apache.zookeeper.server.ZooKeeperServerMain $ZOOPORT /tmp/zkdata 3000 $ZKMAXCNXNS &> /tmp/zk.log &
         pid=$!
         pid=$!
         echo -n $! > /tmp/zk.pid
         echo -n $! > /tmp/zk.pid
-        else
+    else
         mkdir -p "${base_dir}/build/tmp/zkdata"
         mkdir -p "${base_dir}/build/tmp/zkdata"
         java -cp "$CLASSPATH" org.apache.zookeeper.server.ZooKeeperServerMain $ZOOPORT "${base_dir}/build/tmp/zkdata" 3000 $ZKMAXCNXNS &> "${base_dir}/build/tmp/zk.log" &
         java -cp "$CLASSPATH" org.apache.zookeeper.server.ZooKeeperServerMain $ZOOPORT "${base_dir}/build/tmp/zkdata" 3000 $ZKMAXCNXNS &> "${base_dir}/build/tmp/zk.log" &
         pid=$!
         pid=$!
@@ -157,8 +157,8 @@ startReadOnly)
         echo "this target is for unit tests only"
         echo "this target is for unit tests only"
         exit 2
         exit 2
     else
     else
-        mkdir -p /tmp/zkdata
-        rm -f /tmp/zkdata/myid && echo 1 > /tmp/zkdata/myid
+        mkdir -p "${base_dir}/build/tmp/zkdata"
+        rm -f "${base_dir}/build/tmp/zkdata/myid" && echo 1 > "${base_dir}/build/tmp/zkdata/myid"
 
 
         # force read-only mode
         # force read-only mode
         java -cp "$CLASSPATH" -Dreadonlymode.enabled=true org.apache.zookeeper.server.quorum.QuorumPeerMain ${base_dir}/src/c/tests/quorum.cfg &> "${base_dir}/build/tmp/zk.log" &
         java -cp "$CLASSPATH" -Dreadonlymode.enabled=true org.apache.zookeeper.server.quorum.QuorumPeerMain ${base_dir}/src/c/tests/quorum.cfg &> "${base_dir}/build/tmp/zk.log" &