Merge branch 'unstable' into test-util-testname

.github/workflows/ci.yml

@@ -78,16 +78,14 @@ jobs:
     - name: make
       run: make SERVER_CFLAGS='-Werror' MALLOC=libc
 
-  build-centos7-jemalloc:
+  build-almalinux8-jemalloc:
     runs-on: ubuntu-latest
-    container: centos:7
+    container: almalinux:8
     steps:
-    # on centos7, actions/checkout@v4 does not work, so we use v3
-    # ref. https://github.com/actions/checkout/issues/1487
-    - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
     - name: make
       run: |
-        yum -y install gcc make
-        make SERVER_CFLAGS='-Werror'
+        dnf -y install epel-release gcc make procps-ng which
+        make -j SERVER_CFLAGS='-Werror'
 

.github/workflows/clang-format.yml

@@ -0,0 +1,48 @@
+name: Clang Format Check
+
+on:
+  pull_request:
+    paths:
+      - 'src/**'
+
+jobs:
+  clang-format-check:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+
+    - name: Set up Clang
+      run: |
+        sudo apt-get update -y
+        sudo apt-get upgrade -y
+        sudo apt-get install software-properties-common -y
+        wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor | sudo tee /usr/share/keyrings/llvm-toolchain.gpg > /dev/null
+        echo "deb [signed-by=/usr/share/keyrings/llvm-toolchain.gpg] http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-18 main" | sudo tee /etc/apt/sources.list.d/llvm.list
+        sudo apt-get update -y
+        sudo apt-get install clang-format-18 -y
+    - name: Run clang-format
+      id: clang-format
+      run: |
+        # Run clang-format and capture the diff
+        cd src
+        shopt -s globstar
+        clang-format-18 -i **/*.c **/*.h
+        # Capture the diff output
+        DIFF=$(git diff)
+        if [ ! -z "$DIFF" ]; then
+          # Encode the diff in Base64 to ensure it's handled as a single line
+          ENCODED_DIFF=$(echo "$DIFF" | base64 -w 0)
+          echo "diff=$ENCODED_DIFF" >> $GITHUB_OUTPUT
+        fi
+      shell: bash
+
+    - name: Check for formatting changes
+      if: ${{ steps.clang-format.outputs.diff }}
+      run: |
+        echo "Code is not formatted correctly. Here is the diff:"
+        # Decode the Base64 diff to display it
+        echo "${{ steps.clang-format.outputs.diff }}" | base64 --decode
+        exit 1
+      shell: bash

.github/workflows/daily.yml

@@ -11,7 +11,7 @@ on:
     inputs:
       skipjobs:
         description: 'jobs to skip (delete the ones you wanna keep, do not leave empty)'
-        default: 'valgrind,sanitizer,tls,freebsd,macos,alpine,32bit,iothreads,ubuntu,centos,malloc,specific,fortify,reply-schema'
+        default: 'valgrind,sanitizer,tls,freebsd,macos,alpine,32bit,iothreads,ubuntu,rpm-distros,malloc,specific,fortify,reply-schema'
       skiptests:
         description: 'tests to skip (delete the ones you wanna keep, do not leave empty)'
         default: 'valkey,modules,sentinel,cluster,unittest'
@@ -672,13 +672,34 @@ jobs:
         if: true && !contains(github.event.inputs.skiptests, 'unittest')
         run: ./src/valkey-unit-tests --accurate
 
-  test-centos7-jemalloc:
-    runs-on: ubuntu-latest
+  test-rpm-distros-jemalloc:
     if: |
-      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'valkey-io/valkey')) &&
-      !contains(github.event.inputs.skipjobs, 'centos')
-    container: centos:7
+       (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'valkey-io/valkey')) &&
+       !contains(github.event.inputs.skipjobs, 'rpm-distros')
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: test-almalinux8-jemalloc
+            container: almalinux:8
+            install_epel: true
+          - name: test-almalinux9-jemalloc
+            container: almalinux:8
+            install_epel: true
+          - name: test-centosstream9-jemalloc
+            container: quay.io/centos/centos:stream9
+            install_epel: true
+          - name: test-fedoralatest-jemalloc
+            container: fedora:latest
+          - name: test-fedorarawhide-jemalloc
+            container: fedora:rawhide
+
+    name: ${{ matrix.name }}
+    runs-on: ubuntu-latest
+
+    container: ${{ matrix.container }}
     timeout-minutes: 14400
+
     steps:
     - name: prep
       if: github.event_name == 'workflow_dispatch'
@@ -689,18 +710,19 @@ jobs:
         echo "skiptests: ${{github.event.inputs.skiptests}}"
         echo "test_args: ${{github.event.inputs.test_args}}"
         echo "cluster_test_args: ${{github.event.inputs.cluster_test_args}}"
-    # On centos7 actions/checkout@v4 does not work, so we use v3
-    # ref. https://github.com/actions/checkout/issues/1487
-    - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       with:
         repository: ${{ env.GITHUB_REPOSITORY }}
         ref: ${{ env.GITHUB_HEAD_REF }}
+    - name: Install EPEL
+      if: matrix.install_epel
+      run: dnf -y install epel-release
     - name: make
       run: |
-        yum -y install gcc make
-        make SERVER_CFLAGS='-Werror'
+        dnf -y install gcc make procps-ng which /usr/bin/kill
+        make -j SERVER_CFLAGS='-Werror'
     - name: testprep
-      run: yum -y install which tcl tclx
+      run: dnf -y install tcl tcltls
     - name: test
       if: true && !contains(github.event.inputs.skiptests, 'valkey')
       run: ./runtest --accurate --verbose --dump-logs ${{github.event.inputs.test_args}}
@@ -714,13 +736,34 @@ jobs:
       if: true && !contains(github.event.inputs.skiptests, 'cluster')
       run: ./runtest-cluster ${{github.event.inputs.cluster_test_args}}
 
-  test-centos7-tls-module:
-    runs-on: ubuntu-latest
+  test-rpm-distros-tls-module:
     if: |
-      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'valkey-io/valkey')) &&
-      !contains(github.event.inputs.skipjobs, 'tls')
-    container: centos:7
+       (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'valkey-io/valkey')) &&
+       !contains(github.event.inputs.skipjobs, 'tls')
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: test-almalinux8-tls-module
+            container: almalinux:8
+            install_epel: true
+          - name: test-almalinux9-tls-module
+            container: almalinux:8
+            install_epel: true
+          - name: test-centosstream9-tls-module
+            container: quay.io/centos/centos:stream9
+            install_epel: true
+          - name: test-fedoralatest-tls-module
+            container: fedora:latest
+          - name: test-fedorarawhide-tls-module
+            container: fedora:rawhide
+
+    name: ${{ matrix.name }}
+    runs-on: ubuntu-latest
+
+    container: ${{ matrix.container }}
     timeout-minutes: 14400
+
     steps:
     - name: prep
       if: github.event_name == 'workflow_dispatch'
@@ -731,20 +774,20 @@ jobs:
         echo "skiptests: ${{github.event.inputs.skiptests}}"
         echo "test_args: ${{github.event.inputs.test_args}}"
         echo "cluster_test_args: ${{github.event.inputs.cluster_test_args}}"
-    # On centos7 actions/checkout@v4 does not work, so we use v3
-    # ref. https://github.com/actions/checkout/issues/1487
-    - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       with:
         repository: ${{ env.GITHUB_REPOSITORY }}
         ref: ${{ env.GITHUB_HEAD_REF }}
+    - name: Install EPEL
+      if: matrix.install_epel
+      run: dnf -y install epel-release
     - name: make
       run: |
-        yum -y install centos-release-scl epel-release
-        yum -y install devtoolset-7 openssl-devel openssl
-        scl enable devtoolset-7 "make BUILD_TLS=module SERVER_CFLAGS='-Werror'"
+        dnf -y install make gcc openssl-devel openssl procps-ng which /usr/bin/kill
+        make -j BUILD_TLS=module SERVER_CFLAGS='-Werror'
     - name: testprep
       run: |
-        yum -y install tcl tcltls tclx
+        dnf -y install tcl tcltls
         ./utils/gen-test-certs.sh
     - name: test
       if: true && !contains(github.event.inputs.skiptests, 'valkey')
@@ -763,13 +806,34 @@ jobs:
       run: |
         ./runtest-cluster --tls-module ${{github.event.inputs.cluster_test_args}}
 
-  test-centos7-tls-module-no-tls:
-    runs-on: ubuntu-latest
+  test-rpm-distros-tls-module-no-tls:
     if: |
-      (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'valkey-io/valkey')) &&
-      !contains(github.event.inputs.skipjobs, 'tls')
-    container: centos:7
+       (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'valkey-io/valkey')) &&
+       !contains(github.event.inputs.skipjobs, 'tls')
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: test-almalinux8-tls-module-no-tls
+            container: almalinux:8
+            install_epel: true
+          - name: test-almalinux9-tls-module-no-tls
+            container: almalinux:8
+            install_epel: true
+          - name: test-centosstream9-tls-module-no-tls
+            container: quay.io/centos/centos:stream9
+            install_epel: true
+          - name: test-fedoralatest-tls-module-no-tls
+            container: fedora:latest
+          - name: test-fedorarawhide-tls-module-no-tls
+            container: fedora:rawhide
+
+    name: ${{ matrix.name }}
+    runs-on: ubuntu-latest
+
+    container: ${{ matrix.container }}
     timeout-minutes: 14400
+
     steps:
     - name: prep
       if: github.event_name == 'workflow_dispatch'
@@ -780,20 +844,20 @@ jobs:
         echo "skiptests: ${{github.event.inputs.skiptests}}"
         echo "test_args: ${{github.event.inputs.test_args}}"
         echo "cluster_test_args: ${{github.event.inputs.cluster_test_args}}"
-    # On centos7 actions/checkout@v4 does not work, so we use v3
-    # ref. https://github.com/actions/checkout/issues/1487
-    - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       with:
         repository: ${{ env.GITHUB_REPOSITORY }}
         ref: ${{ env.GITHUB_HEAD_REF }}
+    - name: Install EPEL
+      if: matrix.install_epel
+      run: dnf -y install epel-release
     - name: make
       run: |
-        yum -y install centos-release-scl epel-release
-        yum -y install devtoolset-7 openssl-devel openssl
-        scl enable devtoolset-7 "make BUILD_TLS=module SERVER_CFLAGS='-Werror'"
+        dnf -y install make gcc openssl-devel openssl procps-ng which /usr/bin/kill
+        make -j BUILD_TLS=module SERVER_CFLAGS='-Werror'
     - name: testprep
       run: |
-        yum -y install tcl tcltls tclx
+        dnf -y install tcl tcltls
         ./utils/gen-test-certs.sh
     - name: test
       if: true && !contains(github.event.inputs.skiptests, 'valkey')
@@ -1074,7 +1138,7 @@ jobs:
   notify-about-job-results:
     runs-on: ubuntu-latest
     if: always() && github.event_name != 'workflow_dispatch' && github.repository == 'valkey-io/valkey'
-    needs: [test-ubuntu-jemalloc, test-ubuntu-jemalloc-fortify, test-ubuntu-libc-malloc, test-ubuntu-no-malloc-usable-size, test-ubuntu-32bit, test-ubuntu-tls, test-ubuntu-tls-no-tls, test-ubuntu-io-threads, test-ubuntu-reclaim-cache, test-valgrind-test, test-valgrind-misc, test-valgrind-no-malloc-usable-size-test, test-valgrind-no-malloc-usable-size-misc, test-sanitizer-address, test-sanitizer-undefined, test-centos7-jemalloc, test-centos7-tls-module, test-centos7-tls-module-no-tls, test-macos-latest, test-macos-latest-sentinel, test-macos-latest-cluster, build-macos, test-freebsd, test-alpine-jemalloc, test-alpine-libc-malloc, reply-schemas-validator]
+    needs: [test-ubuntu-jemalloc, test-ubuntu-jemalloc-fortify, test-ubuntu-libc-malloc, test-ubuntu-no-malloc-usable-size, test-ubuntu-32bit, test-ubuntu-tls, test-ubuntu-tls-no-tls, test-ubuntu-io-threads, test-ubuntu-reclaim-cache, test-valgrind-test, test-valgrind-misc, test-valgrind-no-malloc-usable-size-test, test-valgrind-no-malloc-usable-size-misc, test-sanitizer-address, test-sanitizer-undefined, test-rpm-distros-jemalloc, test-rpm-distros-tls-module, test-rpm-distros-tls-module-no-tls, test-macos-latest, test-macos-latest-sentinel, test-macos-latest-cluster, build-macos, test-freebsd, test-alpine-jemalloc, test-alpine-libc-malloc, reply-schemas-validator]
     steps:
       - name: Collect job status
         run: |

.gitignore

@@ -43,3 +43,5 @@ Makefile.dep
 compile_commands.json
 redis.code-workspace
 .cache
+.cscope*
+.swp

src/acl.c

@@ -2428,20 +2428,21 @@ sds ACLLoadFromFile(const char *filename) {
             client *c = listNodeValue(ln);
             user *original = c->user;
             list *channels = NULL;
-            user *new = ACLGetUserByName(c->user->name, sdslen(c->user->name));
-            if (new && user_channels) {
-                if (!raxFind(user_channels, (unsigned char *)(new->name), sdslen(new->name), (void **)&channels)) {
-                    channels = getUpcomingChannelList(new, original);
-                    raxInsert(user_channels, (unsigned char *)(new->name), sdslen(new->name), channels, NULL);
+            user *new_user = ACLGetUserByName(c->user->name, sdslen(c->user->name));
+            if (new_user && user_channels) {
+                if (!raxFind(user_channels, (unsigned char *)(new_user->name), sdslen(new_user->name),
+                             (void **)&channels)) {
+                    channels = getUpcomingChannelList(new_user, original);
+                    raxInsert(user_channels, (unsigned char *)(new_user->name), sdslen(new_user->name), channels, NULL);
                 }
             }
             /* When the new channel list is NULL, it means the new user's channel list is a superset of the old user's
              * list. */
-            if (!new || (channels && ACLShouldKillPubsubClient(c, channels))) {
+            if (!new_user || (channels && ACLShouldKillPubsubClient(c, channels))) {
                 freeClient(c);
                 continue;
             }
-            c->user = new;
+            c->user = new_user;
         }
 
         if (user_channels) raxFreeWithCallback(user_channels, (void (*)(void *))listRelease);

src/aof.c

@@ -946,7 +946,7 @@ void stopAppendOnly(void) {
     server.aof_last_incr_size = 0;
     server.aof_last_incr_fsync_offset = 0;
     server.fsynced_reploff = -1;
-    atomicSet(server.fsynced_reploff_pending, 0);
+    atomic_store_explicit(&server.fsynced_reploff_pending, 0, memory_order_relaxed);
     killAppendOnlyChild();
     sdsfree(server.aof_buf);
     server.aof_buf = sdsempty();
@@ -985,11 +985,10 @@ int startAppendOnly(void) {
     }
     server.aof_last_fsync = server.mstime;
     /* If AOF fsync error in bio job, we just ignore it and log the event. */
-    int aof_bio_fsync_status;
-    atomicGet(server.aof_bio_fsync_status, aof_bio_fsync_status);
+    int aof_bio_fsync_status = atomic_load_explicit(&server.aof_bio_fsync_status, memory_order_relaxed);
     if (aof_bio_fsync_status == C_ERR) {
         serverLog(LL_WARNING, "AOF reopen, just ignore the AOF fsync error in bio job");
-        atomicSet(server.aof_bio_fsync_status, C_OK);
+        atomic_store_explicit(&server.aof_bio_fsync_status, C_OK, memory_order_relaxed);
     }
 
     /* If AOF was in error state, we just ignore it and log the event. */
@@ -1074,7 +1073,7 @@ void flushAppendOnlyFile(int force) {
              * (because there's no reason, from the AOF POV, to call fsync) and then WAITAOF may wait on
              * the higher offset (which contains data that was only propagated to replicas, and not to AOF) */
             if (!sync_in_progress && server.aof_fsync != AOF_FSYNC_NO)
-                atomicSet(server.fsynced_reploff_pending, server.master_repl_offset);
+                atomic_store_explicit(&server.fsynced_reploff_pending, server.master_repl_offset, memory_order_relaxed);
             return;
         }
     }
@@ -1244,7 +1243,7 @@ void flushAppendOnlyFile(int force) {
         latencyAddSampleIfNeeded("aof-fsync-always", latency);
         server.aof_last_incr_fsync_offset = server.aof_last_incr_size;
         server.aof_last_fsync = server.mstime;
-        atomicSet(server.fsynced_reploff_pending, server.master_repl_offset);
+        atomic_store_explicit(&server.fsynced_reploff_pending, server.master_repl_offset, memory_order_relaxed);
     } else if (server.aof_fsync == AOF_FSYNC_EVERYSEC && server.mstime - server.aof_last_fsync >= 1000) {
         if (!sync_in_progress) {
             aof_background_fsync(server.aof_fd);
@@ -2409,7 +2408,7 @@ int rewriteAppendOnlyFileBackground(void) {
 
         /* Set the initial repl_offset, which will be applied to fsynced_reploff
          * when AOFRW finishes (after possibly being updated by a bio thread) */
-        atomicSet(server.fsynced_reploff_pending, server.master_repl_offset);
+        atomic_store_explicit(&server.fsynced_reploff_pending, server.master_repl_offset, memory_order_relaxed);
         server.fsynced_reploff = 0;
     }
 
@@ -2647,8 +2646,8 @@ void backgroundRewriteDoneHandler(int exitcode, int bysignal) {
             /* Update the fsynced replication offset that just now become valid.
              * This could either be the one we took in startAppendOnly, or a
              * newer one set by the bio thread. */
-            long long fsynced_reploff_pending;
-            atomicGet(server.fsynced_reploff_pending, fsynced_reploff_pending);
+            long long fsynced_reploff_pending =
+                atomic_load_explicit(&server.fsynced_reploff_pending, memory_order_relaxed);
             server.fsynced_reploff = fsynced_reploff_pending;
         }