Skip to content

Commit 334af8f

Browse files
markhannummarkhannum
committed
Enable Jepsen tests for RR
Signed-off-by: Mark Hannum <[email protected]>
1 parent ee809c4 commit 334af8f

File tree

16 files changed

+493
-27
lines changed

16 files changed

+493
-27
lines changed

‎tests/TODO‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,6 @@ sc_resume
6060
DISABLED TESTS:
6161
async_sc_bench.test -- benchmark for paper
6262
halt_processor_tds.test -- requires a cluster
63-
jepsen_a6.test -- jepsen tests require java & root access
64-
jepsen_a6_nemesis.test
65-
jepsen_atomic_writes.test
66-
jepsen_bank_nemesis.test
67-
jepsen_bank.test
68-
jepsen_dirty_reads.test
69-
jepsen_g2.test
70-
jepsen_register_nemesis.test
71-
jepsen_register.test
72-
jepsen_sets_nemesis.test
73-
jepsen_sets.test
7463
killcluster.test
7564
netloss.test -- does not pass most of the time; requires kernel 4.x & docker 17.x
7665
overflowblobs.test -- timesout

‎tests/docker/Dockerfile.install‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ RUN apt-get update && \
1212
gdb \
1313
git \
1414
iproute2 \
15+
iptables \
1516
iputils-ping \
1617
jq \
1718
libevent-dev \
@@ -29,10 +30,12 @@ RUN apt-get update && \
2930
libz-dev \
3031
lsof \
3132
make \
33+
maven \
3234
ncurses-dev \
3335
netcat-openbsd \
3436
net-tools \
3537
openssh-server \
38+
openjdk-11-jdk \
3639
protobuf-c-compiler \
3740
psmisc \
3841
pstack \
@@ -50,14 +53,17 @@ RUN apt-get update && \
5053

5154
COPY . /comdb2
5255

53-
RUN cd /comdb2 && \
56+
RUN export JAVA_HOME=$(dirname $(dirname $(readlink -f $(which java)))) && \
57+
cd /comdb2/cdb2jdbc && \
58+
make install && \
59+
cd /comdb2 && \
5460
rm -rf build && \
5561
mkdir build && \
5662
cd build && \
5763
cmake -DWITH_TCL=1 -DCOMDB2_TEST=1 .. && \
5864
make -j4 && \
5965
make -j4 test-tools && \
60-
make install && \
66+
make install && \
6167
cp /comdb2/tests/docker/client / && \
6268
cp /comdb2/tests/docker/server / && \
6369
apt-get clean

‎tests/jepsen_a6.test/runit‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#debug_trace="-D"
66
export CDB2JDBC_STATEMENT_QUERYEFFECTS=1
77
export CDB2JDBC_VERIFY_RETRY=0
8+
export LEIN="${LEIN:=$TESTSROOTDIR/tools/lein}"
89

910
[[ "$debug" == 1 ]] && set -x
1011
needcluster=0
@@ -98,7 +99,7 @@ function runtestwithoptions
9899
export CDB2_CONFIG_FILE=${CDB2_CONFIG}
99100
(
100101
cd ${TESTSROOTDIR}/tools/linearizable/jepsen
101-
lein run test $testargs > $outfile 2>&1 < /dev/null
102+
$LEIN run test $testargs > $outfile 2>&1 < /dev/null
102103
r=$? ; [[ $r != 0 ]] && echo "XXX JEPSEN ERROR Lein test returns $r" >> $outfile
103104
)
104105
cat $outfile

‎tests/jepsen_a6_nemesis.test/runit‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#debug_trace="-D"
66
export CDB2JDBC_STATEMENT_QUERYEFFECTS=1
77
export CDB2JDBC_VERIFY_RETRY=0
8+
export LEIN="${LEIN:=$TESTSROOTDIR/tools/lein}"
89

910
[[ "$debug" == 1 ]] && set -x
1011
needcluster=0
@@ -98,7 +99,7 @@ function runtestwithoptions
9899
export CDB2_CONFIG_FILE=${CDB2_CONFIG}
99100
(
100101
cd ${TESTSROOTDIR}/tools/linearizable/jepsen
101-
lein run test $testargs > $outfile 2>&1 < /dev/null
102+
$LEIN run test $testargs > $outfile 2>&1 < /dev/null
102103
r=$? ; [[ $r != 0 ]] && echo "XXX JEPSEN ERROR Lein test returns $r" >> $outfile
103104
)
104105
cat $outfile

‎tests/jepsen_atomic_writes.test/runit‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#debug_trace="-D"
66
export CDB2JDBC_STATEMENT_QUERYEFFECTS=1
77
export CDB2JDBC_VERIFY_RETRY=0
8+
export LEIN="${LEIN:=$TESTSROOTDIR/tools/lein}"
89

910
[[ "$debug" == 1 ]] && set -x
1011
needcluster=0
@@ -98,7 +99,7 @@ function runtestwithoptions
9899
export CDB2_CONFIG_FILE=${CDB2_CONFIG}
99100
(
100101
cd ${TESTSROOTDIR}/tools/linearizable/jepsen
101-
lein run test $testargs > $outfile 2>&1 < /dev/null
102+
$LEIN run test $testargs > $outfile 2>&1 < /dev/null
102103
r=$? ; [[ $r != 0 ]] && echo "XXX JEPSEN ERROR Lein test returns $r" >> $outfile
103104
)
104105
cat $outfile

‎tests/jepsen_bank.test/runit‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#debug_trace="-D"
66
export CDB2JDBC_STATEMENT_QUERYEFFECTS=1
77
export CDB2JDBC_VERIFY_RETRY=0
8+
export LEIN="${LEIN:=$TESTSROOTDIR/tools/lein}"
89

910
[[ "$debug" == 1 ]] && set -x
1011
needcluster=0
@@ -97,7 +98,7 @@ function runtestwithoptions
9798
export CDB2_CONFIG_FILE=${CDB2_CONFIG}
9899
(
99100
cd ${TESTSROOTDIR}/tools/linearizable/jepsen
100-
lein run test $testargs > $outfile 2>&1 < /dev/null
101+
$LEIN run test $testargs > $outfile 2>&1 < /dev/null
101102
r=$? ; [[ $r != 0 ]] && echo "XXX JEPSEN ERROR Lein test returns $r" >> $outfile
102103
)
103104
cat $outfile

‎tests/jepsen_bank_nemesis.test/runit‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#debug_trace="-D"
66
export CDB2JDBC_STATEMENT_QUERYEFFECTS=1
77
export CDB2JDBC_VERIFY_RETRY=0
8+
export LEIN="${LEIN:=$TESTSROOTDIR/tools/lein}"
89

910
[[ "$debug" == 1 ]] && set -x
1011
needcluster=1
@@ -97,7 +98,7 @@ function runtestwithoptions
9798
export CDB2_CONFIG_FILE=${CDB2_CONFIG}
9899
(
99100
cd ${TESTSROOTDIR}/tools/linearizable/jepsen
100-
lein run test $testargs > $outfile 2>&1 < /dev/null
101+
$LEIN run test $testargs > $outfile 2>&1 < /dev/null
101102
r=$? ; [[ $r != 0 ]] && echo "XXX JEPSEN ERROR Lein test returns $r" >> $outfile
102103
)
103104
cat $outfile

‎tests/jepsen_dirty_reads.test/runit‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#debug_trace="-D"
66
export CDB2JDBC_STATEMENT_QUERYEFFECTS=1
77
export CDB2JDBC_VERIFY_RETRY=0
8+
export LEIN="${LEIN:=$TESTSROOTDIR/tools/lein}"
89

910
[[ "$debug" == 1 ]] && set -x
1011
needcluster=0
@@ -97,7 +98,7 @@ function runtestwithoptions
9798
export CDB2_CONFIG_FILE=${CDB2_CONFIG}
9899
(
99100
cd ${TESTSROOTDIR}/tools/linearizable/jepsen
100-
lein run test $testargs > $outfile 2>&1 < /dev/null
101+
$LEIN run test $testargs > $outfile 2>&1 < /dev/null
101102
r=$? ; [[ $r != 0 ]] && echo "XXX JEPSEN ERROR Lein test returns $r" >> $outfile
102103
)
103104
cat $outfile

‎tests/jepsen_g2.test/runit‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#debug_trace="-D"
66
export CDB2JDBC_STATEMENT_QUERYEFFECTS=1
77
export CDB2JDBC_VERIFY_RETRY=0
8+
export LEIN="${LEIN:=$TESTSROOTDIR/tools/lein}"
89

910
[[ "$debug" == 1 ]] && set -x
1011
needcluster=0
@@ -99,7 +100,7 @@ function runtestwithoptions
99100
export CDB2_CONFIG_FILE=${CDB2_CONFIG}
100101
(
101102
cd ${TESTSROOTDIR}/tools/linearizable/jepsen
102-
lein run test $testargs > $outfile 2>&1 < /dev/null
103+
$LEIN run test $testargs > $outfile 2>&1 < /dev/null
103104
r=$? ; [[ $r != 0 ]] && echo "XXX JEPSEN ERROR Lein test returns $r" >> $outfile
104105
)
105106
cat $outfile

‎tests/jepsen_register.test/runit‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
export COMDB2_DEBUG=1
77
export CDB2JDBC_STATEMENT_QUERYEFFECTS=1
88
export CDB2JDBC_VERIFY_RETRY=0
9+
export LEIN="${LEIN:=$TESTSROOTDIR/tools/lein}"
910

1011
[[ "$debug" == 1 ]] && set -x
1112
needcluster=0
@@ -98,7 +99,7 @@ function runtestwithoptions
9899
export CDB2_CONFIG_FILE=${CDB2_CONFIG}
99100
(
100101
cd ${TESTSROOTDIR}/tools/linearizable/jepsen
101-
lein run test $testargs > $outfile 2>&1 < /dev/null
102+
$LEIN run test $testargs > $outfile 2>&1 < /dev/null
102103
r=$? ; [[ $r != 0 ]] && echo "XXX JEPSEN ERROR Lein test returns $r" >> $outfile
103104
)
104105
cat $outfile

0 commit comments

Comments
 (0)