Enable Jepsen tests for RR

markhannum · markhannum · commit 597c668a0cd7 · 2025-08-08T14:27:44.000-04:00
Signed-off-by: Mark Hannum &lt;mhannum@bloomberg.net&gt;
diff --git a/cdb2jdbc/Makefile b/cdb2jdbc/Makefile
@@ -1,6 +1,7 @@
 # shortcut for building jdbc driver via make
 BASEDIR:=$(realpath ..)
 VERSION?=$(shell grep ^comdb2 ../pkg/changelog  | sed 's/^comdb2 .//; s/-.*//g')
+MVNFLAGS?=$(shell echo "${COMDB2_MVN_FLAGS}")
 
 .PHONY: jdbc
 MAVEN_VER := $(shell mvn -version 2>/dev/null)
@@ -9,21 +10,21 @@ envSkipTests?='true'
 
 jdbc:
 ifdef MAVEN_VER
-	+mvn package
+	+mvn $(MVNFLAGS) package
 else
 	$(error "Could not find maven")
 endif
 
 clean:
 ifdef MAVEN_VER
-	+mvn clean
+	+mvn $(MVNFLAGS) clean
 else
 	$(error "Could not find maven")
 endif
 
 install: jdbc
 ifdef MAVEN_VER
-	+mvn install
+	+mvn $(MVNFLAGS) install
 else
 	$(error "Could not find maven")
 endif
diff --git a/tests/TODO b/tests/TODO
@@ -60,17 +60,6 @@ sc_resume
 DISABLED TESTS:
 async_sc_bench.test       -- benchmark for paper
 halt_processor_tds.test   -- requires a cluster
-jepsen_a6.test            -- jepsen tests require java & root access
-jepsen_a6_nemesis.test
-jepsen_atomic_writes.test
-jepsen_bank_nemesis.test
-jepsen_bank.test
-jepsen_dirty_reads.test
-jepsen_g2.test
-jepsen_register_nemesis.test
-jepsen_register.test
-jepsen_sets_nemesis.test
-jepsen_sets.test
 killcluster.test
 netloss.test              -- does not pass most of the time; requires kernel 4.x & docker 17.x
 overflowblobs.test        -- timesout
diff --git a/tests/docker/Dockerfile.install b/tests/docker/Dockerfile.install
@@ -12,6 +12,7 @@ RUN apt-get update && \
     gdb \
     git \
     iproute2 \
+    iptables \
     iputils-ping \
     jq \
     libevent-dev \
@@ -29,10 +30,12 @@ RUN apt-get update && \
     libz-dev \
     lsof \
     make \
+    maven \
     ncurses-dev \
     netcat-openbsd \
     net-tools \
     openssh-server \
+    openjdk-11-jdk \
     protobuf-c-compiler \
     psmisc \
     pstack \
@@ -50,14 +53,18 @@ RUN apt-get update && \
 
 COPY . /comdb2
 
-RUN cd /comdb2 &&  \
+RUN export JAVA_HOME=$(dirname $(dirname $(readlink -f $(which java)))) && \
+    export COMDB2_MVN_FLAGS="-Dhttp.proxyHost=devproxy.bloomberg.com -Dhttp.proxyPort=82 -Dhttps.proxyHost=devproxy.bloomberg.com -Dhttps.proxyPort=82" && \
+    cd /comdb2/cdb2jdbc && \
+    make install && \
+    cd /comdb2 &&  \
     rm -rf build && \
     mkdir build && \
     cd build && \
     cmake -DWITH_TCL=1 -DCOMDB2_TEST=1 .. && \
     make -j4 && \
     make -j4 test-tools && \
-    make install &&  \
+    make install && \
     cp /comdb2/tests/docker/client / && \
     cp /comdb2/tests/docker/server / && \
     apt-get clean
diff --git a/tests/jepsen_a6.test/runit b/tests/jepsen_a6.test/runit
@@ -3,8 +3,8 @@
 # Runs the register linearizability test
 #debug=1
 #debug_trace="-D"
-export CDB2JDBC_STATEMENT_QUERYEFFECTS=1
-export CDB2JDBC_VERIFY_RETRY=0
+
+. ${TESTSROOTDIR}/tools/jepsen_setup.sh
 
 [[ "$debug" == 1 ]] && set -x
 needcluster=0
@@ -98,7 +98,7 @@ function runtestwithoptions
     export CDB2_CONFIG_FILE=${CDB2_CONFIG}
     (
         cd ${TESTSROOTDIR}/tools/linearizable/jepsen
-        lein run test $testargs > $outfile 2>&1 < /dev/null
+        $LEIN run test $testargs > $outfile 2>&1 < /dev/null
         r=$? ; [[ $r != 0 ]] && echo "XXX JEPSEN ERROR Lein test returns $r" >> $outfile
     )
     cat $outfile
diff --git a/tests/jepsen_a6_nemesis.test/runit b/tests/jepsen_a6_nemesis.test/runit
@@ -3,8 +3,8 @@
 # Runs the register linearizability test
 #debug=1
 #debug_trace="-D"
-export CDB2JDBC_STATEMENT_QUERYEFFECTS=1
-export CDB2JDBC_VERIFY_RETRY=0
+
+. ${TESTSROOTDIR}/tools/jepsen_setup.sh
 
 [[ "$debug" == 1 ]] && set -x
 needcluster=0
@@ -98,7 +98,7 @@ function runtestwithoptions
     export CDB2_CONFIG_FILE=${CDB2_CONFIG}
     (
         cd ${TESTSROOTDIR}/tools/linearizable/jepsen
-        lein run test $testargs > $outfile 2>&1 < /dev/null
+        $LEIN run test $testargs > $outfile 2>&1 < /dev/null
         r=$? ; [[ $r != 0 ]] && echo "XXX JEPSEN ERROR Lein test returns $r" >> $outfile
     )
     cat $outfile
diff --git a/tests/jepsen_atomic_writes.test/runit b/tests/jepsen_atomic_writes.test/runit
@@ -3,8 +3,8 @@
 # Runs the register linearizability test
 #debug=1
 #debug_trace="-D"
-export CDB2JDBC_STATEMENT_QUERYEFFECTS=1
-export CDB2JDBC_VERIFY_RETRY=0
+
+. ${TESTSROOTDIR}/tools/jepsen_setup.sh
 
 [[ "$debug" == 1 ]] && set -x
 needcluster=0
@@ -98,7 +98,7 @@ function runtestwithoptions
     export CDB2_CONFIG_FILE=${CDB2_CONFIG}
     (
         cd ${TESTSROOTDIR}/tools/linearizable/jepsen
-        lein run test $testargs > $outfile 2>&1 < /dev/null
+        $LEIN run test $testargs > $outfile 2>&1 < /dev/null
         r=$? ; [[ $r != 0 ]] && echo "XXX JEPSEN ERROR Lein test returns $r" >> $outfile
     )
     cat $outfile
diff --git a/tests/jepsen_bank.test/runit b/tests/jepsen_bank.test/runit
@@ -3,8 +3,8 @@
 # Runs the register linearizability test
 #debug=1
 #debug_trace="-D"
-export CDB2JDBC_STATEMENT_QUERYEFFECTS=1
-export CDB2JDBC_VERIFY_RETRY=0
+
+. ${TESTSROOTDIR}/tools/jepsen_setup.sh
 
 [[ "$debug" == 1 ]] && set -x
 needcluster=0
@@ -97,7 +97,7 @@ function runtestwithoptions
     export CDB2_CONFIG_FILE=${CDB2_CONFIG}
     (
         cd ${TESTSROOTDIR}/tools/linearizable/jepsen
-        lein run test $testargs > $outfile 2>&1 < /dev/null
+        $LEIN run test $testargs > $outfile 2>&1 < /dev/null
         r=$? ; [[ $r != 0 ]] && echo "XXX JEPSEN ERROR Lein test returns $r" >> $outfile
     )
     cat $outfile
diff --git a/tests/jepsen_bank_nemesis.test/runit b/tests/jepsen_bank_nemesis.test/runit
@@ -3,8 +3,8 @@
 # Runs the register linearizability test
 #debug=1
 #debug_trace="-D"
-export CDB2JDBC_STATEMENT_QUERYEFFECTS=1
-export CDB2JDBC_VERIFY_RETRY=0
+
+. ${TESTSROOTDIR}/tools/jepsen_setup.sh
 
 [[ "$debug" == 1 ]] && set -x
 needcluster=1
@@ -97,7 +97,7 @@ function runtestwithoptions
     export CDB2_CONFIG_FILE=${CDB2_CONFIG}
     (
         cd ${TESTSROOTDIR}/tools/linearizable/jepsen
-        lein run test $testargs > $outfile 2>&1 < /dev/null
+        $LEIN run test $testargs > $outfile 2>&1 < /dev/null
         r=$? ; [[ $r != 0 ]] && echo "XXX JEPSEN ERROR Lein test returns $r" >> $outfile
     )
     cat $outfile
diff --git a/tests/jepsen_dirty_reads.test/runit b/tests/jepsen_dirty_reads.test/runit
@@ -3,8 +3,8 @@
 # Runs the register linearizability test
 #debug=1
 #debug_trace="-D"
-export CDB2JDBC_STATEMENT_QUERYEFFECTS=1
-export CDB2JDBC_VERIFY_RETRY=0
+
+. ${TESTSROOTDIR}/tools/jepsen_setup.sh
 
 [[ "$debug" == 1 ]] && set -x
 needcluster=0
@@ -97,7 +97,7 @@ function runtestwithoptions
     export CDB2_CONFIG_FILE=${CDB2_CONFIG}
     (
         cd ${TESTSROOTDIR}/tools/linearizable/jepsen
-        lein run test $testargs > $outfile 2>&1 < /dev/null
+        $LEIN run test $testargs > $outfile 2>&1 < /dev/null
         r=$? ; [[ $r != 0 ]] && echo "XXX JEPSEN ERROR Lein test returns $r" >> $outfile
     )
     cat $outfile
diff --git a/tests/jepsen_g2.test/runit b/tests/jepsen_g2.test/runit
@@ -3,8 +3,8 @@
 # Runs the register linearizability test
 #debug=1
 #debug_trace="-D"
-export CDB2JDBC_STATEMENT_QUERYEFFECTS=1
-export CDB2JDBC_VERIFY_RETRY=0
+
+. ${TESTSROOTDIR}/tools/jepsen_setup.sh
 
 [[ "$debug" == 1 ]] && set -x
 needcluster=0
@@ -99,7 +99,7 @@ function runtestwithoptions
     export CDB2_CONFIG_FILE=${CDB2_CONFIG}
     (
         cd ${TESTSROOTDIR}/tools/linearizable/jepsen
-        lein run test $testargs > $outfile 2>&1 < /dev/null
+        $LEIN run test $testargs > $outfile 2>&1 < /dev/null
         r=$? ; [[ $r != 0 ]] && echo "XXX JEPSEN ERROR Lein test returns $r" >> $outfile
     )
     cat $outfile
diff --git a/tests/jepsen_register.test/runit b/tests/jepsen_register.test/runit
@@ -3,9 +3,10 @@
 # Runs the register linearizability test
 #debug=1
 #debug_trace="-D"
+
+. ${TESTSROOTDIR}/tools/jepsen_setup.sh
+
 export COMDB2_DEBUG=1
-export CDB2JDBC_STATEMENT_QUERYEFFECTS=1
-export CDB2JDBC_VERIFY_RETRY=0
 
 [[ "$debug" == 1 ]] && set -x
 needcluster=0
@@ -98,7 +99,7 @@ function runtestwithoptions
     export CDB2_CONFIG_FILE=${CDB2_CONFIG}
     (
         cd ${TESTSROOTDIR}/tools/linearizable/jepsen
-        lein run test $testargs > $outfile 2>&1 < /dev/null
+        $LEIN run test $testargs > $outfile 2>&1 < /dev/null
         r=$? ; [[ $r != 0 ]] && echo "XXX JEPSEN ERROR Lein test returns $r" >> $outfile
     )
     cat $outfile
diff --git a/tests/jepsen_register_nemesis.test/runit b/tests/jepsen_register_nemesis.test/runit
@@ -3,8 +3,8 @@
 # Runs the register linearizability test
 #debug=1
 #debug_trace="-D"
-export CDB2JDBC_STATEMENT_QUERYEFFECTS=1
-export CDB2JDBC_VERIFY_RETRY=0
+
+. ${TESTSROOTDIR}/tools/jepsen_setup.sh
 
 [[ "$debug" == 1 ]] && set -x
 needcluster=1
@@ -97,7 +97,7 @@ function runtestwithoptions
     export CDB2_CONFIG_FILE=${CDB2_CONFIG}
     (
         cd ${TESTSROOTDIR}/tools/linearizable/jepsen
-        lein run test $testargs > $outfile 2>&1 < /dev/null
+        $LEIN run test $testargs > $outfile 2>&1 < /dev/null
         r=$? ; [[ $r != 0 ]] && echo "XXX JEPSEN ERROR Lein test returns $r" >> $outfile
     )
     cat $outfile
diff --git a/tests/jepsen_sets.test/runit b/tests/jepsen_sets.test/runit
@@ -3,8 +3,8 @@
 # Runs the register linearizability test
 #debug=1
 #debug_trace="-D"
-export CDB2JDBC_STATEMENT_QUERYEFFECTS=1
-export CDB2JDBC_VERIFY_RETRY=0
+
+. ${TESTSROOTDIR}/tools/jepsen_setup.sh
 
 [[ "$debug" == 1 ]] && set -x
 needcluster=0
@@ -98,7 +98,7 @@ function runtestwithoptions
     export CDB2_CONFIG_FILE=${CDB2_CONFIG}
     (
         cd ${TESTSROOTDIR}/tools/linearizable/jepsen
-        lein run test $testargs > $outfile 2>&1 < /dev/null
+        $LEIN run test $testargs > $outfile 2>&1 < /dev/null
         r=$? ; [[ $r != 0 ]] && echo "XXX JEPSEN ERROR Lein test returns $r" >> $outfile
     )
     cat $outfile
diff --git a/tests/jepsen_sets_nemesis.test/runit b/tests/jepsen_sets_nemesis.test/runit
@@ -3,7 +3,8 @@
 # Runs the register linearizability test
 #debug=1
 #debug_trace="-D"
-export CDB2JDBC_STATEMENT_QUERYEFFECTS=1
+
+. ${TESTSROOTDIR}/tools/jepsen_setup.sh
 
 [[ "$debug" == 1 ]] && set -x
 needcluster=1
@@ -97,7 +98,7 @@ function runtestwithoptions
     export CDB2_CONFIG_FILE=${CDB2_CONFIG}
     (
         cd ${TESTSROOTDIR}/tools/linearizable/jepsen
-        lein test $jepsentest > $outfile 2>&1 < /dev/null
+        $LEIN test $jepsentest > $outfile 2>&1 < /dev/null
         r=$? ; [[ $r != 0 ]] && echo "XXX JEPSEN ERROR Lein test returns $r" >> $outfile
     )
     cat $outfile
diff --git a/tests/tools/jepsen_setup.sh b/tests/tools/jepsen_setup.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+export CDB2JDBC_STATEMENT_QUERYEFFECTS=1
+export CDB2JDBC_VERIFY_RETRY=0
+export LEIN="${LEIN:=$TESTSROOTDIR/tools/lein}"
+
+if [[ -n "$COMDB2_LEIN_JVM_OPTS" ]]; then
+    export LEIN_JVM_OPTS="$COMDB2_LEIN_JVM_OPTS"
+fi
+
+if [[ -n "$COMDB2_LEIN_HTTP_PROXY" ]]; then
+    export http_proxy=${COMDB2_LEIN_HTTP_PROXY}
+    export HTTP_PROXY=${COMDB2_LEIN_HTTP_PROXY}
+fi
+
+if [[ -n "$COMDB2_LEIN_HTTPS_PROXY" ]]; then
+    export https_proxy=${COMDB2_LEIN_HTTPS_PROXY}
+    export HTTPS_PROXY=${COMDB2_LEIN_HTTPS_PROXY}
+fi
+
diff --git a/tests/tools/lein b/tests/tools/lein
diff --git a/tests/tools/linearizable/jepsen/project.clj b/tests/tools/linearizable/jepsen/project.clj
diff --git a/tests/tools/linearizable/jepsen/src/comdb2/core.clj b/tests/tools/linearizable/jepsen/src/comdb2/core.clj
