feature(cassandra-stress): use ScyllaDB fork of Cassandra Stress instead of downloading Apache Cassandra

CodeLieutenant · CodeLieutenant · commit e831e30d0ec7 · 2025-03-17T15:30:15.000+01:00
Signed-off-by: Dusan Malusev &lt;dusan.malusev@scylladb.com&gt;
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,3 @@
+cassandra-download/
+target/
+.github/
diff --git a/.github/workflows/dockerhub-description.yml b/.github/workflows/dockerhub-description.yml
@@ -18,6 +18,6 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-          repository: scylladb/latte
+          repository: scylladb/cql-stress
           short-description: ${{ github.event.repository.description }}
           enable-url-completion: true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -3,7 +3,12 @@ name: "Release"
 on:
   push:
     tags:
-      - "*"
+      - "v*"
+
+env:
+  RUSTFLAGS: "--cfg fetch_extended_version_info"
+  CARGO_TERM_COLOR: always
+  PYTHONUNBUFFERED: "1"
 
 jobs:
   get_tag:
@@ -18,26 +23,22 @@ jobs:
         uses: olegtarasov/get-tag@v2.1.3
         id: version_tag
         with:
-          tagRegex: "(.*)"
+          tagRegex: "v(.*)"
 
   release:
     runs-on: ubuntu-24.04
+    needs: [get_tag]
     steps:
       - name: Create release
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          tag: ${{ github.ref_name }}
+          GH_TOKEN: ${{ github.token }}
+        shell: bash
         run: |
           set +e
-          if [[ "$(gh release view $tag 2>&1)" == "release not found" ]]; then
-            echo "Release '$tag' not found. Creating..."
-            gh release create "$tag" \
-                --repo="$GITHUB_REPOSITORY" \
-                --title="${GITHUB_REPOSITORY#*/} ${tag#}" \
-                --generate-notes
-          else
-            echo "Release '$tag' found. Skipping this step..."
-          fi
+          gh release create "v${{ needs.get_tag.outputs.tag }}" \
+              --repo="$GITHUB_REPOSITORY" \
+              --title="v${{ needs.get_tag.outputs.tag }}" \
+              --generate-notes
 
   docker_build:
     uses: ./.github/workflows/docker.yml
@@ -59,35 +60,44 @@ jobs:
         uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
 
-      - name: Build Binary
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: --release
-
-      - name: Set Binary Name
-        id: set_binary_name
-        run: |
-          BIN_NAME="cql-stress-${{ needs.get_tag.outputs.tag }}-${{ matrix.os }}"
-          echo "BIN_NAME=$BIN_NAME" >> $GITHUB_ENV
-          echo "BIN_NAME=$BIN_NAME"
-        shell: bash
-
       - name: Get Release Upload URL
-        id: get_upload_url
+        shell: bash
         run: |
-          UPLOAD_URL=$(gh release view ${{ inputs.version }} --json uploadUrl -q '.uploadUrl' | sed 's/{.*//')
-          echo "UPLOAD_URL=${UPLOAD_URL}?name=${{ env.BIN_NAME }}" >> $GITHUB_ENV
+          UPLOAD_URL=$(gh release view v${{ needs.get_tag.outputs.tag }} --json uploadUrl -q '.uploadUrl' | sed 's/{.*//')
+          BIN_NAME_CS="cql-stress-cassandra-stress-${{ needs.get_tag.outputs.tag }}-${{ matrix.os }}"
+          BIN_NAME_SB="cql-stress-scylla-bench-${{ needs.get_tag.outputs.tag }}-${{ matrix.os }}"
+          echo "BIN_NAME_CS=$BIN_NAME_CS" >> $GITHUB_ENV
+          echo "BIN_NAME_CS=$BIN_NAME_CS"
+          echo "BIN_NAME_SB=$BIN_NAME_SB" >> $GITHUB_ENV
+          echo "BIN_NAME_SB=$BIN_NAME_SB"
+          echo "UPLOAD_URL_CS=$UPLOAD_URL?name=$BIN_NAME_CS" >> $GITHUB_ENV
+          echo "UPLOAD_URL_SB=$UPLOAD_URL?name=$BIN_NAME_SB" >> $GITHUB_ENV
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Build
+        uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: --profile dist --all
+
+      - name: Upload Release Asset
+        id: upload-release-asset-cs
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ env.UPLOAD_URL_CS }}
+          asset_path: ./target/dist/cql-stress-cassandra-stress
+          asset_name: ${{ env.BIN_NAME_CS }}
+          asset_content_type: application/octet-stream
       - name: Upload Release Asset
-        id: upload-release-asset-unix
+        id: upload-release-asset-sb
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ env.UPLOAD_URL }}
-          asset_path: ./target/release/cql-stress
-          asset_name: ${{ env.BIN_NAME }}
+          upload_url: ${{ env.UPLOAD_URL_SB }}
+          asset_path: ./target/dist/cql-stress-scylla-bench
+          asset_name: ${{ env.BIN_NAME_SB }}
           asset_content_type: application/octet-stream
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -52,75 +52,67 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: build
-          args: --release --bin cql-stress-cassandra-stress
-      - name: Build cql-stress-scylla-bench binary
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: --release --bin cql-stress-scylla-bench
+          args: --profile dist --all
 
       - uses: actions/upload-artifact@v4
         with:
           name: cql-stress-cassandra-stress
-          path: "./target/release/cql-stress-cassandra-stress"
+          path: "./target/dist/cql-stress-cassandra-stress"
           if-no-files-found: error
           retention-days: 1
       - uses: actions/upload-artifact@v4
         with:
           name: cql-stress-scylla-bench
-          path: "./target/release/cql-stress-scylla-bench"
+          path: "./target/dist/cql-stress-scylla-bench"
           if-no-files-found: error
           retention-days: 1
   test:
     runs-on: ubuntu-24.04
-    services:
-      scylladb:
-        image: scylladb/scylla
-        ports:
-          - 9042:9042
-        options: >-
-          --name scylla-ci
-          --health-cmd "cqlsh --debug"
-          --health-interval 5s
-          --health-retries 10
-        volumes:
-          - ${{ github.workspace }}:/workspace
     steps:
     - uses: actions/checkout@v4
     - uses: actions-rust-lang/setup-rust-toolchain@v1
       with:
         cache: true
+    - name: Start ScyllaDB
+      run: |
+        docker compose -f ./docker/scylla-test/compose.yml up -d --wait
+        until docker logs scylla_test 2>&1 | grep "Starting listening for CQL clients" > /dev/null; do sleep 0.2; done
     - uses: actions-rs/cargo@v1
       with:
         command: build
-        args: --release --tests --features "user-profile"
+        args: --tests --features "user-profile"
     - uses: actions-rs/cargo@v1
       with:
         command: test
         # test threads must be one because else database tests will run in parallel and will result in flaky tests
         args: --features "user-profile" -- --test-threads=1
 
   integration-tests:
-    needs: [build]
+    needs: [build, test]
+    cancel-timeout-minutes: 1
+    timeout-minutes: 20
     runs-on: ubuntu-24.04
-    services:
-      scylladb:
-        image: scylladb/scylla
-        ports:
-          - 9042:9042
-        options: >-
-          --name scylla-ci
-          --health-cmd "cqlsh --debug"
-          --health-interval 5s
-          --health-retries 10
-        volumes:
-          - ${{ github.workspace }}:/workspace
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.binary }}
+    strategy:
+      max-parallel: 2
+      matrix:
+        binary: [cql-stress-cassandra-stress]
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/download-artifact@v4
       - name: Install python driver
         run: pip install scylla-driver
       - name: Install pytest
         run: pip install -U pytest
+      - name: Start ScyllaDB
+        run: |
+          docker compose -f ./docker/scylla-test/compose.yml up -d --wait
+          until docker logs scylla_test 2>&1 | grep "Starting listening for CQL clients" > /dev/null; do sleep 0.2; done
+      - uses: actions/download-artifact@v4
+        with:
+          name: ${{ matrix.binary }}
       - name: C-S frontend tests
-        run: pytest -s ./tools/cassandra_stress_ci.py
+        run: |
+          mv ${{ matrix.binary }} /usr/local/bin
+          chmod +x /usr/local/bin/${{ matrix.binary }}
+          pytest -s ./tools/${{ matrix.binary }}-ci.py
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,6 +6,31 @@ rust-version = "1.85.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[[bin]]
+name = "cql-stress-cassandra-stress"
+path = "src/bin/cql-stress-cassandra-stress/main.rs"
+
+[[bin]]
+name = "cql-stress-scylla-bench"
+path = "src/bin/cql-stress-scylla-bench/main.rs"
+
+[profile.release]
+codegen-units = 1
+lto = true
+panic = "abort"
+
+[profile.dist]
+inherits = "release"
+opt-level = 3
+overflow-checks = false
+debug = false
+strip = true
+debug-assertions = false
+
+[profile.dev-opt]
+inherits = "dev"
+opt-level = 2
+
 [dependencies]
 anyhow = "1.0.52"
 async-trait = "0.1.52"
@@ -62,4 +87,6 @@ scylla = { version = "1.0.0", features = [
 ] }
 
 [lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(fetch_extended_version_info)'] }
+unexpected_cfgs = { level = "warn", check-cfg = [
+    'cfg(fetch_extended_version_info)',
+] }
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,39 @@
+FROM rust:1.85-slim-bookworm AS builder
+
+WORKDIR /app
+
+ENV RUSTFLAGS="--cfg fetch_extended_version_info"
+ENV CARGO_TERM_COLOR=always
+
+COPY . .
+
+RUN apt-get update && apt-get install -y \
+    build-essential \
+    cmake \
+    libclang-dev \
+    git \
+    libssl-dev \
+    pkg-config \
+    && cargo build --profile dist --all
+
+FROM debian:bookworm-slim AS production
+
+ENV PATH="${PATH}:/usr/local/bin"
+
+LABEL org.opencontainers.image.source="https://github.com/scylladb/cql-stress"
+LABEL org.opencontainers.image.title="ScyllaDB cql-stress"
+
+COPY --from=builder /app/target/dist/cql-stress-cassandra-stress /usr/local/bin/cql-stress-cassandra-stress
+COPY --from=builder /app/target/dist/cql-stress-scylla-bench /usr/local/bin/cql-stress-scylla-bench
+
+RUN --mount=type=cache,target=/var/cache/apt apt-get update \
+    && apt-get upgrade -y \
+    && apt-get install -y libssl3 \
+    && apt-get autoremove -y \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
+    && chmod +x /usr/local/bin/cql-stress-cassandra-stress /usr/local/bin/cql-stress-scylla-bench \
+    && ln -s /usr/local/bin/cql-stress-cassandra-stress /usr/local/bin/cassandra-stress \
+    && ln -s /usr/local/bin/cql-stress-scylla-bench /usr/local/bin/scylla-bench
+
+ENTRYPOINT [ "bash" ]
diff --git a/docker/scylla-test/compose.yml b/docker/scylla-test/compose.yml
@@ -4,6 +4,7 @@ services:
     container_name: scylla_test
     ports:
       - 9042:9042
+      - 19042:19042
     healthcheck:
       test: [ "CMD", "cqlsh", "-e", "select * from system.local" ]
       interval: 5s
diff --git a/tools/cql-stress-cassandra-stress-ci.py b/tools/cql-stress-cassandra-stress-ci.py
diff --git a/tools/util/cassandra_stress.py b/tools/util/cassandra_stress.py
diff --git a/tools/util/scylla_docker.py b/tools/util/scylla_docker.py

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+cassandra-download/`
	`2`	`+target/`
	`3`	`+.github/`