Merge branch 'unstable' into feature/automated-test-failure-detector

Signed-off-by: Hanxi Zhang <hanxizh@amazon.com>

Author: hanxizh9910

.config/typos.toml

@@ -5,7 +5,7 @@ extend-exclude = [
     ".git/",
     "deps/",
     # crc16_slottable is primarily pre-generated random strings.
-    "src/crc16_slottable.h",
+    "src/crc16_slottable.c",
 ]
 ignore-hidden = false
 

.github/workflows/benchmark-on-label.yml

@@ -20,7 +20,8 @@ permissions:
 jobs:
   benchmark:
     if: |
-      github.event.action == 'labeled' && github.event.label.name == 'run-benchmark' &&
+      github.event.action == 'labeled' &&
+      (github.event.label.name == 'run-benchmark' || github.event.label.name == 'run-cluster-benchmark') &&
       github.repository == 'valkey-io/valkey'
 
     runs-on: ["self-hosted", "ec2-al-2023-pr-benchmarking-arm64"]
@@ -86,6 +87,15 @@ jobs:
           echo "VALKEY_BENCHMARK_PATH=$VALKEY_BENCHMARK_PATH" >> $GITHUB_ENV
           echo "Latest valkey-benchmark path: $VALKEY_BENCHMARK_PATH"
 
+      - name: Enable cluster mode in benchmark config
+        working-directory: valkey-perf-benchmark
+        if: github.event.label.name == 'run-cluster-benchmark'
+        run: |
+          CONFIG_FILE="../valkey/.github/benchmark_configs/benchmark-config-arm.json"
+          sed -i 's/"cluster_mode": false/"cluster_mode": true/g' "$CONFIG_FILE"
+          echo "Updated config for cluster mode:"
+          cat "$CONFIG_FILE"
+
       - name: Run benchmarks
         working-directory: valkey-perf-benchmark
         run: |
@@ -120,7 +130,7 @@ jobs:
         continue-on-error: true
         uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
-          name: benchmark-results
+          name: ${{ github.event.label.name }}-results
           path: |
             ./valkey-perf-benchmark/results/${{ github.event.pull_request.merge_commit_sha }}/metrics.json
             ./valkey-perf-benchmark/results/${{ github.event.pull_request.base.ref }}/metrics.json
@@ -137,11 +147,13 @@ jobs:
             const sha = '${{ github.event.pull_request.head.sha }}';
             const short = sha.slice(0,7);
             const link = `[\`${short}\`](https://github.com/${owner}/${repo}/commit/${sha})`
+            const label = '${{ github.event.label.name }}';
+            const prefix = label === 'run-cluster-benchmark' ? 'Cluster Benchmark' : 'Benchmark';
             await github.rest.issues.createComment({
               issue_number: context.issue.number,
               owner,
               repo,
-              body: `**Benchmark ran on this commit:** ${link}\n\n${body}`
+              body: `**${prefix} ran on this commit:** ${link}\n\n${body}`
             });
 
       - name: Cleanup any running valkey processes
@@ -160,7 +172,7 @@ jobs:
           fi
 
       - name: Remove ${{ github.event.label.name }} label
-        if: always() && github.event.label.name == 'run-benchmark'
+        if: always() && (github.event.label.name == 'run-benchmark' || github.event.label.name == 'run-cluster-benchmark')
         uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ci.yml

@@ -37,7 +37,7 @@ jobs:
         # build with TLS just for compilation coverage
         run: |
           sudo apt-get install pkg-config libgtest-dev libgmock-dev
-          make -j4 all-with-unit-tests SERVER_CFLAGS='-Werror' BUILD_TLS=yes USE_FAST_FLOAT=yes USE_LIBBACKTRACE=yes
+          make -j4 all-with-unit-tests SERVER_CFLAGS='-Werror' BUILD_TLS=yes USE_LIBBACKTRACE=yes
       - name: test
         run: |
           sudo apt-get install tcl8.6 tclx
@@ -79,7 +79,7 @@ jobs:
       - name: make
         # Fail build if there are warnings
         # build with TLS just for compilation coverage
-        run: make -j4 all-with-unit-tests SERVER_CFLAGS='-Werror' BUILD_TLS=yes USE_FAST_FLOAT=yes USE_LIBBACKTRACE=yes
+        run: make -j4 all-with-unit-tests SERVER_CFLAGS='-Werror' BUILD_TLS=yes USE_LIBBACKTRACE=yes
 
       - name: Install old server (${{ matrix.server.version }}) for compatibility testing
         run: |
@@ -236,7 +236,9 @@ jobs:
           export PATH="/opt/homebrew/opt/llvm/bin:$PATH"
           export CC=/opt/homebrew/opt/llvm/bin/clang
           export CXX=/opt/homebrew/opt/llvm/bin/clang++
-          make -j3 all-with-unit-tests SERVER_CFLAGS='-Werror' USE_FAST_FLOAT=yes USE_LIBBACKTRACE=yes LIBBACKTRACE_PREFIX=/usr/local
+          export AR=/opt/homebrew/opt/llvm/bin/llvm-ar
+          export RANLIB=/opt/homebrew/opt/llvm/bin/llvm-ranlib
+          make -j3 all-with-unit-tests SERVER_CFLAGS='-Werror' USE_LIBBACKTRACE=yes LIBBACKTRACE_PREFIX=/usr/local
 
   build-32bit:
     runs-on: ubuntu-latest
@@ -276,7 +278,7 @@ jobs:
         # suffixed version of g++. g++-multilib generally includes libstdc++.
         # *cross version as well, but it is also added explicitly just in case.
         run: |
-          make -j4 SERVER_CFLAGS='-Werror' 32bit USE_FAST_FLOAT=yes USE_LIBBACKTRACE=yes LIBBACKTRACE_PREFIX=/usr/local/libbacktrace32 \
+          make -j4 SERVER_CFLAGS='-Werror' 32bit USE_LIBBACKTRACE=yes LIBBACKTRACE_PREFIX=/usr/local/libbacktrace32 \
             GTEST_CFLAGS="-I/usr/src/googletest/googletest/include -I/usr/src/googletest/googlemock/include" \
             GTEST_LIBS="/usr/lib32/libgtest.a /usr/lib32/libgmock.a"
       - name: unit tests
@@ -296,7 +298,7 @@ jobs:
       - name: Checkout Valkey
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: make
-        run: make -j4 SERVER_CFLAGS='-Werror' MALLOC=libc USE_FAST_FLOAT=yes USE_LIBBACKTRACE=yes
+        run: make -j4 SERVER_CFLAGS='-Werror' MALLOC=libc USE_LIBBACKTRACE=yes
 
   build-almalinux8-jemalloc:
     runs-on: ubuntu-latest
@@ -315,7 +317,7 @@ jobs:
       - name: Checkout Valkey
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: make
-        run: make -j4 SERVER_CFLAGS='-Werror' USE_FAST_FLOAT=yes USE_LIBBACKTRACE=yes
+        run: make -j4 SERVER_CFLAGS='-Werror' USE_LIBBACKTRACE=yes
 
   format-yaml:
     runs-on: ubuntu-latest