Merge branch 'master' of github.com:scylladb/gocql

.github/issue_template.md

@@ -1,9 +1,9 @@
 Please answer these questions before submitting your issue. Thanks!
 
-### What version of Scylla or Cassandra are you using?
+### What version of ScyllaDB or Cassandra are you using?
 
 
-### What version of Gocql are you using?
+### What version of ScyllaDB Gocql driver are you using?
 
 
 ### What version of Go are you using?

.github/workflows/clean_dockerhub_images.yml

@@ -0,0 +1,30 @@
+name: Docker Cleanup
+
+on:
+  schedule:
+    - cron: '0 12 * * 1'  # Runs every Monday at noon (UTC)
+  workflow_dispatch:
+
+jobs:
+  cleanup:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repository
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.x"
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install requests
+
+      - name: Run Docker image cleanup
+        run: make clean-old-temporary-docker-images
+        env:
+          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+          DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+          DELETE_AFTER_DAYS: 30

.github/workflows/extended-ci-longevity-large-partitions-with-network-nemesis-1h-test.yml

@@ -0,0 +1,72 @@
+name: Build scylla-bench docker image with gocql PR
+
+on:
+  pull_request_target:
+    types: [opened, synchronize, reopened, labeled]
+
+jobs:
+  trigger-longevity-large-partitions-with-network-nemesis-1h-test:
+    if: contains(github.event.pull_request.labels.*.name, 'extended-ci')
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        scylla-version: [ENTERPRISE-RELEASE, OSS-RELEASE]
+    steps:
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Check out the scylla-bench repository
+        uses: actions/checkout@v4
+        with:
+          repository: scylladb/scylla-bench
+          path: scylla-bench
+
+      - name: Checkout GoCQL PR Repository
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+          ref: ${{ github.event.pull_request.head.ref }}
+          path: gocql
+
+      - name: Build and push Scylla-bench Docker Image with gocql from PR
+        run: |
+          cd scylla-bench
+          GOCQL_REPO="github.com/${{ github.event.pull_request.head.repo.full_name }}" GOCQL_VERSION="${{ github.event.pull_request.head.sha }}" make build-with-custom-gocql-version
+          DOCKER_IMAGE_TAG="scylladb/gocql-extended-ci:scylla-bench-${{ github.event.pull_request.head.sha }}" DOCKER_IMAGE_LABELS="com.scylladb.gocql-version=${{ github.event.pull_request.head.sha }}" make build-sct-docker-image
+          docker push "scylladb/gocql-extended-ci:scylla-bench-${{ github.event.pull_request.head.sha }}"
+
+      - name: Install get-version CLI
+        run: |
+          git clone https://github.com/scylladb-actions/get-version.git
+          cd get-version
+          go mod tidy
+          go build -o get-version
+
+      - name: Get scylla version
+        id: scylla-version
+        run: |
+          cd get-version
+          if [[ "${{ matrix.scylla-version }}" == "ENTERPRISE-RELEASE" ]]; then
+            echo "value=$(./get-version --source dockerhub-imagetag --repo scylladb/scylla-enterprise -filters "2024.1.LAST" | tr -d '\"')" | tee -a $GITHUB_OUTPUT
+          elif [[ "${{ matrix.scylla-version }}" == "OSS-RELEASE" ]]; then
+            echo "value=$(./get-version --source dockerhub-imagetag --repo scylladb/scylla -filters "6.1.LAST" | tr -d '\"')" | tee -a $GITHUB_OUTPUT
+          elif echo "${{ matrix.scylla-version }}" | grep -P '^[0-9\.]+'; then # If you want to run specific version do just that
+            echo "value=${{ matrix.scylla-version }}" | tee -a $GITHUB_OUTPUT
+          else
+            echo "Unknown scylla version name `${{ matrix.scylla-version }}`"
+            exit 1
+          fi
+
+      - name: Start Jenkins job
+        uses: scylladb-actions/jenkins-client@v0.1.0
+        with:
+          job_name: scylla-drivers/job/gocql/job/extended-ci/job/longevity-large-partitions-with-network-nemesis-1h-test
+          job_parameters: '{"email_recipients": "scylla-drivers@scylladb.com", "scylla_version": "${{ steps.scylla-version.outputs.value }}", "extra_environment_variables": "SCT_STRESS_IMAGE.scylla-bench=scylladb/gocql-extended-ci:scylla-bench-${{ github.event.pull_request.head.sha }}"}'
+          base_url: https://jenkins.scylladb.com
+          user: ${{ secrets.JENKINS_USERNAME }}
+          password: ${{ secrets.JENKINS_TOKEN }}
+          wait_timeout: 3h
+          polling_interval: 1s

.github/workflows/main.yml

@@ -12,11 +12,11 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     env:
-      SCYLLA_IMAGE: scylladb/scylla:4.6.3
+      SCYLLA_IMAGE: scylladb/scylla:6.1.1
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-go@v2
-      - uses: actions/cache@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+      - uses: actions/cache@v4
         id: gomod-cache
         with:
           path: ~/go/pkg/mod
@@ -31,9 +31,11 @@ jobs:
 
       - name: Install Docker compose
         env:
-          DOCKER_COMPOSE_VERSION: 1.27.4
+          DOCKER_COMPOSE_VERSION: 2.20.0
         run: sudo curl -L "https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
 
+      - run: sudo sh -c "echo 2097152 >> /proc/sys/fs/aio-max-nr"
       - run: ./integration.sh cassandra scylla
       - run: ./integration.sh integration scylla
       - run: ./integration.sh ccm
+      - run: ./integration.sh tablet

AUTHORS

@@ -133,3 +133,16 @@ Stefan Miklosovic <smiklosovic@apache.org>
 Adam Burk <amburk@gmail.com>
 Valerii Ponomarov <kiparis.kh@gmail.com>
 Neal Turett <neal.turett@datadoghq.com>
+Doug Schaapveld <djschaap@gmail.com>
+Steven Seidman <steven.seidman@datadoghq.com>
+Wojciech Przytuła <wojciech.przytula@scylladb.com>
+João Reis <joao.reis@datastax.com>
+Lauro Ramos Venancio <lauro.venancio@incognia.com>
+Dmitry Kropachev <dmitry.kropachev@gmail.com>
+Oliver Boyle <pleasedontspamme4321+gocql@gmail.com>
+Jackson Fleming <jackson.fleming@instaclustr.com>
+Sylwia Szunejko <sylwia.szunejko@scylladb.com>
+Karol Baryła <karol.baryla@scylladb.com>
+Marcin Mazurek <marcinek.mazurek@gmail.com>
+Moguchev Leonid Alekseevich <lmoguchev@ozon.ru>
+Julien Lefevre <julien.lefevr@gmail.com>

Makefile

@@ -0,0 +1,5 @@
+# Makefile to run the Docker cleanup script
+
+clean-old-temporary-docker-images:
+	@echo "Running Docker Hub image cleanup script..."
+	python ci/clean-old-temporary-docker-images.py