Implement microbench test target type

michaelsembwever · michaelsembwever · commit 73284754a82b · 2026-01-04T15:53:09.000+01:00
Unify declaration and add assertions on target types
 Fix dirname usages for macos
diff --git a/.build/build-artifacts.sh b/.build/build-artifacts.sh
@@ -16,7 +16,7 @@
 # limitations under the License.
 
 # variables, with defaults
-[ "x${CASSANDRA_DIR}" != "x" ] || CASSANDRA_DIR="$(readlink -f $(dirname "$0")/..)"
+[ "x${CASSANDRA_DIR}" != "x" ] || CASSANDRA_DIR="$(readlink -f $(dirname -- "$0")/..)"
 
 # pre-conditions
 command -v ant >/dev/null 2>&1 || { echo >&2 "ant needs to be installed"; exit 1; }
diff --git a/.build/build-jars.sh b/.build/build-jars.sh
@@ -18,7 +18,7 @@
 # temporary between CASSANDRA-18133 and CASSANDRA-18594
 
 # variables, with defaults
-[ "x${CASSANDRA_DIR}" != "x" ] || CASSANDRA_DIR="$(readlink -f $(dirname "$0")/..)"
+[ "x${CASSANDRA_DIR}" != "x" ] || CASSANDRA_DIR="$(readlink -f $(dirname -- "$0")/..)"
 
 # pre-conditions
 command -v ant >/dev/null 2>&1 || { echo >&2 "ant needs to be installed"; exit 1; }
diff --git a/.build/check-code.sh b/.build/check-code.sh
@@ -16,7 +16,7 @@
 # limitations under the License.
 
 # variables, with defaults
-[ "x${CASSANDRA_DIR}" != "x" ] || { CASSANDRA_DIR="$(dirname "$0")/.."; }
+[ "x${CASSANDRA_DIR}" != "x" ] || { CASSANDRA_DIR="$(dirname -- "$0")/.."; }
 
 # pre-conditions
 command -v ant >/dev/null 2>&1 || { echo >&2 "ant needs to be installed"; exit 1; }
diff --git a/.build/ci/generate-ci-summary.sh b/.build/ci/generate-ci-summary.sh
@@ -28,7 +28,7 @@
 #
 
 # variables, with defaults
-[ "x${CASSANDRA_DIR}" != "x" ] || CASSANDRA_DIR="$(readlink -f $(dirname "$0")/../..)"
+[ "x${CASSANDRA_DIR}" != "x" ] || CASSANDRA_DIR="$(readlink -f $(dirname -- "$0")/../..)"
 [ "x${DIST_DIR}" != "x" ] || DIST_DIR="${CASSANDRA_DIR}/build"
 
 # pre-conditions
diff --git a/.build/ci/generate-test-report.sh b/.build/ci/generate-test-report.sh
@@ -24,7 +24,7 @@
 #
 
 # variables, with defaults
-[ "x${CASSANDRA_DIR}" != "x" ] || CASSANDRA_DIR="$(readlink -f $(dirname "$0")/../..)"
+[ "x${CASSANDRA_DIR}" != "x" ] || CASSANDRA_DIR="$(readlink -f $(dirname -- "$0")/../..)"
 [ "x${DIST_DIR}" != "x" ] || DIST_DIR="${CASSANDRA_DIR}/build"
 
 # pre-conditions
diff --git a/.build/docker/_build-debian.sh b/.build/docker/_build-debian.sh
@@ -24,7 +24,7 @@
 [ $DEBUG ] && set -x
 
 # variables, with defaults
-[ "x${CASSANDRA_DIR}" != "x" ] || CASSANDRA_DIR="$(readlink -f $(dirname "$0")/..)"
+[ "x${CASSANDRA_DIR}" != "x" ] || CASSANDRA_DIR="$(readlink -f $(dirname -- "$0")/..)"
 [ "x${DIST_DIR}" != "x" ] || DIST_DIR="${CASSANDRA_DIR}/build"
 
 # pre-conditions
diff --git a/.build/docker/_build-redhat.sh b/.build/docker/_build-redhat.sh
@@ -22,7 +22,7 @@
 ################################
 
 # variables, w/ defaults, w/ checks
-[ "x${CASSANDRA_DIR}" != "x" ] || CASSANDRA_DIR="$(readlink -f $(dirname "$0")/..)"
+[ "x${CASSANDRA_DIR}" != "x" ] || CASSANDRA_DIR="$(readlink -f $(dirname -- "$0")/..)"
 [ "x${DIST_DIR}" != "x" ] || DIST_DIR="${CASSANDRA_DIR}/build"
 [ "x${RPM_BUILD_DIR}" != "x" ] || RPM_BUILD_DIR="$(mktemp -d /tmp/rpmbuild.XXXXXX)"
 
diff --git a/.build/docker/_docker_run.sh b/.build/docker/_docker_run.sh
@@ -29,7 +29,7 @@
 [ $DEBUG ] && set -x
 
 # variables, with defaults
-[ "x${cassandra_dir}" != "x" ] || cassandra_dir="$(readlink -f $(dirname "$0")/../..)"
+[ "x${cassandra_dir}" != "x" ] || cassandra_dir="$(readlink -f $(dirname -- "$0")/../..)"
 [ "x${build_dir}" != "x" ] || build_dir="${cassandra_dir}/build"
 [ "x${m2_dir}" != "x" ] || m2_dir="${HOME}/.m2/repository"
 [ -d "${build_dir}" ] || { mkdir -p "${build_dir}" ; }
diff --git a/.build/docker/build-artifacts.sh b/.build/docker/build-artifacts.sh
@@ -18,5 +18,5 @@
 #
 # Creates the tarball artifact
 
-$(dirname "$0")/_docker_run.sh bullseye-build.docker build-artifacts.sh $1
+$(dirname -- "$0")/_docker_run.sh bullseye-build.docker build-artifacts.sh $1
 exit $?
diff --git a/.build/docker/build-debian.sh b/.build/docker/build-debian.sh
@@ -32,5 +32,5 @@ echo
 #
 # Creates the debian package
 
-$(dirname "$0")/_docker_run.sh bullseye-build.docker docker/_build-debian.sh $1
+$(dirname -- "$0")/_docker_run.sh bullseye-build.docker docker/_build-debian.sh $1
 exit $?
diff --git a/.build/docker/build-jars.sh b/.build/docker/build-jars.sh
@@ -18,5 +18,5 @@
 #
 # Build the jars
 
-$(dirname "$0")/_docker_run.sh bullseye-build.docker build-jars.sh $1
+$(dirname -- "$0")/_docker_run.sh bullseye-build.docker build-jars.sh $1
 exit $?
diff --git a/.build/docker/build-redhat.sh b/.build/docker/build-redhat.sh
@@ -36,5 +36,5 @@ echo
 #
 # Creates the redhat package
 
-$(dirname "$0")/_docker_run.sh almalinux-build.docker docker/_build-redhat.sh "${java_version}" ${rpm_dist}
+$(dirname -- "$0")/_docker_run.sh almalinux-build.docker docker/_build-redhat.sh "${java_version}" ${rpm_dist}
 exit $?
diff --git a/.build/docker/check-code.sh b/.build/docker/check-code.sh
@@ -20,4 +20,4 @@
 
 export CASSANDRA_DOCKER_ANT_OPTS="-Ddependency-check.home.base=/tmp"
 
-$(dirname "$0")/_docker_run.sh bullseye-build.docker check-code.sh $1
+$(dirname -- "$0")/_docker_run.sh bullseye-build.docker check-code.sh $1
diff --git a/.build/docker/run-tests.sh b/.build/docker/run-tests.sh
@@ -21,10 +21,23 @@
 
 [ $DEBUG ] && set -x
 
+# variables, with defaults
+[ "x${cassandra_dir}" != "x" ] || cassandra_dir="$(readlink -f $(dirname -- "$0")/../..)"
+[ "x${cassandra_dtest_dir}" != "x" ] || cassandra_dtest_dir="${cassandra_dir}/../cassandra-dtest"
+[ "x${build_dir}" != "x" ] || build_dir="${cassandra_dir}/build"
+[ "x${m2_dir}" != "x" ] || m2_dir="${HOME}/.m2/repository"
+[ -d "${build_dir}" ] || { mkdir -p "${build_dir}" ; }
+[ -d "${m2_dir}" ] || { mkdir -p "${m2_dir}" ; }
+
+# source TARGET_TYPES from the non-docker scripts
+_target_test_types="$(grep '^TARGET_TYPES=' "${cassandra_dir}/.build/run-tests.sh" | cut -d'"' -f2)"
+_target_dtest_types="$(cd ${cassandra_dir}; bash <(sed -n "/^TARGET_TYPES=/,/^done$/p" .build/run-python-dtests.sh; echo 'echo ${TARGET_TYPES}'))"
+TARGET_TYPES="${_target_test_types} ${_target_dtest_types}"
+
 print_help() {
   echo ""
   echo "Usage: $0 [-a|-t|-c|-j|-h] [extra arguments]"
-  echo "   -a Test target type: test, test-compression, test-cdc, ..."
+  echo "   -a Test target type: ${TARGET_TYPES}"
   echo "   -t Test name regexp to run."
   echo "   -c Chunk to run in the form X/Y: Run chunk X from a total of Y chunks."
   echo "   -j Java version. Default java_version is what 'java.default' specifies in build.xml."
@@ -39,28 +52,28 @@ error() {
 }
 
 # legacy argument handling
-case ${1} in
-  "build_dtest_jars" | "stress-test" | "fqltool-test" | "microbench" | "test-burn" | "long-test" | "cqlsh-test" | "simulator-dtest" | "dtest" | "dtest-novnode" | "dtest-latest" | "dtest-large" | "dtest-large-novnode" | "dtest-upgrade" | "dtest-upgrade-novnode"| "dtest-upgrade-large" | "dtest-upgrade-novnode-large" | "test" | "test-cdc" | "test-compression" | "test-oa" | "test-system-keyspace-directory" | "test-latest" | "jvm-dtest" | "jvm-dtest-upgrade" | "jvm-dtest-novnode" | "jvm-dtest-upgrade-novnode")
-    test_type="-a ${1}"
-    if [[ -z ${2} ]]; then
-      test_list=""
-    elif [[ -n ${2} && "${2}" =~ ^[0-9]+/[0-9]+$ ]]; then
-      test_list="-c ${2}";
-    else
-      test_list="-t ${2}";
-    fi
-    if [[ -n ${3} ]]; then java_version="-j ${3}"; else java_version=""; fi
-    echo "Using deprecated legacy arguments.  Please update to new parameter format: ${test_type} ${test_list} ${java_version}"
-    $0 ${test_type} ${test_list} ${java_version}
-    exit $?
-esac
+if [[ " ${TARGET_TYPES} " =~ " ${1} " ]]; then
+  test_type="-a ${1}"
+  if [[ -z ${2} ]]; then
+    test_list=""
+  elif [[ -n ${2} && "${2}" =~ ^[0-9]+/[0-9]+$ ]]; then
+    test_list="-c ${2}";
+  else
+    test_list="-t ${2}";
+  fi
+  if [[ -n ${3} ]]; then java_version="-j ${3}"; else java_version=""; fi
+  echo "Using deprecated legacy arguments.  Please update to new parameter format: ${test_type} ${test_list} ${java_version}"
+  $0 ${test_type} ${test_list} ${java_version}
+  exit $?
+fi
 
 env_vars=""
 while getopts ":a:t:c:e:hj:" opt; do
   # shellcheck disable=SC2220
   # Invalid flags check disabled as we'll pass them to other scripts
   case $opt in
     a ) test_target="$OPTARG"
+        [[ " ${TARGET_TYPES} " =~ " ${test_target/-repeat/} " ]] || error 1 "Invalid test target type '${test_target}'. Valid types: ${TARGET_TYPES}"
         ;;
     t ) test_name_regexp="$OPTARG"
         ;;
@@ -79,14 +92,6 @@ while getopts ":a:t:c:e:hj:" opt; do
   esac
 done
 
-# variables, with defaults
-[ "x${cassandra_dir}" != "x" ] || cassandra_dir="$(readlink -f $(dirname "$0")/../..)"
-[ "x${cassandra_dtest_dir}" != "x" ] || cassandra_dtest_dir="${cassandra_dir}/../cassandra-dtest"
-[ "x${build_dir}" != "x" ] || build_dir="${cassandra_dir}/build"
-[ "x${m2_dir}" != "x" ] || m2_dir="${HOME}/.m2/repository"
-[ -d "${build_dir}" ] || { mkdir -p "${build_dir}" ; }
-[ -d "${m2_dir}" ] || { mkdir -p "${m2_dir}" ; }
-
 # pre-conditions
 command -v docker >/dev/null 2>&1 || { error 1 "docker needs to be installed"; }
 command -v bc >/dev/null 2>&1 || { error 1 "bc needs to be installed"; }
diff --git a/.build/run-python-dtests.sh b/.build/run-python-dtests.sh
@@ -27,11 +27,24 @@
 
 [ $DEBUG ] && set -x
 
+# target types
+TARGET_TYPES="dtest dtest-upgrade"
+for base in ${TARGET_TYPES}; do
+  for novnode in "" "-novnode"; do
+    for large in "" "-large"; do
+      for latest in "" "-latest"; do
+        variant="${novnode}${large}${latest}"
+        [[ -n "${variant}" ]] && TARGET_TYPES="${TARGET_TYPES} ${base}${variant}"
+      done
+    done
+  done
+done
+
 # help
 if [ "$#" -lt 1 ] || [ "$1" == "-h" ]; then
     echo ""
     echo "Usage: $0 [-a|-t|-c|-j|-h]"
-    echo "   -a Test target type: dtest, dtest-latest, ..."
+    echo "   -a Test target type: ${TARGET_TYPES}"
     echo "   -t Test name regexp to run."
     echo "   -c Chunk to run in the form X/Y: Run chunk X from a total of Y chunks."
     echo ""
@@ -46,6 +59,7 @@ DTEST_TARGET="dtest"
 while getopts "a:t:c:hj:" opt; do
   case $opt in
     a ) DTEST_TARGET="$OPTARG"
+        [[ " ${TARGET_TYPES} " =~ " ${DTEST_TARGET/-repeat/} " ]] || error 1 "Invalid test target type '${DTEST_TARGET}'. Valid types: ${TARGET_TYPES}"
         ;;
     t ) DTEST_SPLIT_CHUNK="$OPTARG"
         ;;
@@ -65,7 +79,7 @@ if [ "$#" -ne 0 ]; then
 fi
 
 # variables, with defaults
-[ "x${CASSANDRA_DIR}" != "x" ] || CASSANDRA_DIR="$(readlink -f $(dirname "$0")/..)"
+[ "x${CASSANDRA_DIR}" != "x" ] || CASSANDRA_DIR="$(readlink -f $(dirname -- "$0")/..)"
 [ "x${CASSANDRA_DTEST_DIR}" != "x" ] || CASSANDRA_DTEST_DIR="$(readlink -f ${CASSANDRA_DIR}/../cassandra-dtest)"
 [ "x${DIST_DIR}" != "x" ] || DIST_DIR="${CASSANDRA_DIR}/build"
 [ "x${TMPDIR}" != "x" ] || { TMPDIR_SET=1 && export TMPDIR="$(mktemp -d ${DIST_DIR}/run-python-dtest.XXXXXX)" ; }
diff --git a/.build/run-tests.sh b/.build/run-tests.sh
@@ -27,9 +27,12 @@ set -o pipefail
 [ $DEBUG ] && set -x
 
 # variables, with defaults
-[ "x${CASSANDRA_DIR}" != "x" ] || CASSANDRA_DIR="$(readlink -f $(dirname "$0")/..)"
+[ "x${CASSANDRA_DIR}" != "x" ] || CASSANDRA_DIR="$(readlink -f $(dirname -- "$0")/..)"
 [ "x${DIST_DIR}" != "x" ] || DIST_DIR="${CASSANDRA_DIR}/build"
 
+# target types
+TARGET_TYPES="build_dtest_jars stress-test fqltool-test microbench test-burn long-test cqlsh-test simulator-dtest test test-cdc test-compression test-oa test-system-keyspace-directory test-latest jvm-dtest jvm-dtest-upgrade jvm-dtest-novnode jvm-dtest-upgrade-novnode"
+
 # pre-conditions
 command -v ant >/dev/null 2>&1 || { error 1 "ant needs to be installed"; }
 command -v git >/dev/null 2>&1 || { error 1 "git needs to be installed"; }
@@ -47,7 +50,7 @@ error() {
 
 print_help() {
   echo "Usage: $0 [-a|-t|-c|-e|-i|-b|-s|-h]"
-  echo "   -a Test target type: test, test-compression, test-cdc, ..."
+  echo "   -a Test target type: ${TARGET_TYPES}"
   echo "   -t Test name regexp to run."
   echo "   -c Chunk to run in the form X/Y: Run chunk X from a total of Y chunks."
   echo "   -b Specify the base git branch for comparison when determining changed tests to"
@@ -65,20 +68,19 @@ print_help() {
 
 
 # legacy argument handling
-case ${1} in
-  "build_dtest_jars" | "stress-test" | "fqltool-test" | "microbench" | "test-burn" | "long-test" | "cqlsh-test" | "simulator-dtest" | "test" | "test-cdc" | "test-compression" | "test-oa" | "test-system-keyspace-directory" | "test-latest" | "jvm-dtest" | "jvm-dtest-upgrade" | "jvm-dtest-novnode" | "jvm-dtest-upgrade-novnode")
-    test_type="-a ${1}"
-    if [[ -z ${2} ]]; then
-      test_list=""
-    elif [[ -n ${2} && "${2}" =~ ^[0-9]+/[0-9]+$ ]]; then
-      test_list="-c ${2}";
-    else
-      test_list="-t ${2}";
-    fi
-    echo "Using deprecated legacy arguments.  Please update to new parameter format: ${test_type} ${test_list}"
-    $0 ${test_type} ${test_list}
-    exit $?
-esac
+if [[ " ${TARGET_TYPES} " =~ " ${1} " ]]; then
+  test_type="-a ${1}"
+  if [[ -z ${2} ]]; then
+    test_list=""
+  elif [[ -n ${2} && "${2}" =~ ^[0-9]+/[0-9]+$ ]]; then
+    test_list="-c ${2}";
+  else
+    test_list="-t ${2}";
+  fi
+  echo "Using deprecated legacy arguments.  Please update to new parameter format: ${test_type} ${test_list}"
+  $0 ${test_type} ${test_list}
+  exit $?
+fi
 
 
 env_vars=""
@@ -88,6 +90,7 @@ detect_changed_tests=true
 while getopts "a:t:c:e:ib:shj:" opt; do
   case $opt in
     a ) test_target="$OPTARG"
+        [[ " ${TARGET_TYPES} " =~ " ${test_target/-repeat/} " ]] || error 1 "Invalid test target type '${test_target}'. Valid types: ${TARGET_TYPES}"
         ;;
     t ) test_name_regexp="$OPTARG"
         ;;
diff --git a/.jenkins/Jenkinsfile b/.jenkins/Jenkinsfile
diff --git a/.jenkins/k8s/jenkins-deployment.yaml b/.jenkins/k8s/jenkins-deployment.yaml

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`#`
`29`	`29`
`30`	`30`	`# variables, with defaults`
`31`		`-[ "x${CASSANDRA_DIR}" != "x" ] \|\| CASSANDRA_DIR="$(readlink -f $(dirname "$0")/../..)"`
	`31`	`+[ "x${CASSANDRA_DIR}" != "x" ] \|\| CASSANDRA_DIR="$(readlink -f $(dirname -- "$0")/../..)"`
`32`	`32`	`[ "x${DIST_DIR}" != "x" ] \|\| DIST_DIR="${CASSANDRA_DIR}/build"`
`33`	`33`
`34`	`34`	`# pre-conditions`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`#`
`25`	`25`
`26`	`26`	`# variables, with defaults`
`27`		`-[ "x${CASSANDRA_DIR}" != "x" ] \|\| CASSANDRA_DIR="$(readlink -f $(dirname "$0")/../..)"`
	`27`	`+[ "x${CASSANDRA_DIR}" != "x" ] \|\| CASSANDRA_DIR="$(readlink -f $(dirname -- "$0")/../..)"`
`28`	`28`	`[ "x${DIST_DIR}" != "x" ] \|\| DIST_DIR="${CASSANDRA_DIR}/build"`
`29`	`29`
`30`	`30`	`# pre-conditions`
Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,5 @@`
`18`	`18`	`#`
`19`	`19`	`# Creates the tarball artifact`
`20`	`20`
`21`		`-$(dirname "$0")/_docker_run.sh bullseye-build.docker build-artifacts.sh $1`
	`21`	`+$(dirname -- "$0")/_docker_run.sh bullseye-build.docker build-artifacts.sh $1`
`22`	`22`	`exit $?`
Original file line number	Diff line number	Diff line change
`@@ -32,5 +32,5 @@ echo`
`32`	`32`	`#`
`33`	`33`	`# Creates the debian package`
`34`	`34`
`35`		`-$(dirname "$0")/_docker_run.sh bullseye-build.docker docker/_build-debian.sh $1`
	`35`	`+$(dirname -- "$0")/_docker_run.sh bullseye-build.docker docker/_build-debian.sh $1`
`36`	`36`	`exit $?`