Ver código fonte

ZOOKEEPER-2948: Failing c unit tests on apache jenkins - fix the config.

Missed the quorum.cfg file which also needs to be updated for the new location.

Change-Id: Ifa65812c2b9c3e11b3f2137aa4d471964c5b4ad6
Patrick Hunt 7 anos atrás
pai
commit
748585d200
2 arquivos alterados com 7 adições e 4 exclusões
  1. 1 1
      src/c/tests/quorum.cfg
  2. 6 3
      src/c/tests/zkServer.sh

+ 1 - 1
src/c/tests/quorum.cfg

@@ -1,7 +1,7 @@
 tickTime=500
 initLimit=10
 syncLimit=5
-dataDir=/tmp/zkdata
+dataDir=TMPDIR/zkdata
 clientPort=22181
 server.1=localhost:22881:33881
 server.2=localhost:22882:33882

+ 6 - 3
src/c/tests/zkServer.sh

@@ -157,11 +157,14 @@ startReadOnly)
         echo "this target is for unit tests only"
         exit 2
     else
-        mkdir -p "${base_dir}/build/tmp/zkdata"
-        rm -f "${base_dir}/build/tmp/zkdata/myid" && echo 1 > "${base_dir}/build/tmp/zkdata/myid"
+        tmpdir="${base_dir}/build/tmp"
+        mkdir -p "${tmpdir}/zkdata"
+        rm -f "${tmpdir}/zkdata/myid" && echo 1 > "${tmpdir}/zkdata/myid"
+
+        sed "s#TMPDIR#${tmpdir}#g" ${base_dir}/src/c/tests/quorum.cfg > "${tmpdir}/quorum.cfg"
 
         # 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 ${tmpdir}/quorum.cfg &> "${tmpdir}/zk.log" &
         pid=$!
         echo -n $pid > "${base_dir}/build/tmp/zk.pid"
         sleep 3 # wait until read-only server is up