Merge branch 'unstable' into cluster_node_flags

Signed-off-by: Harkrishn Patro <[email protected]>
valkey-io · Jun 13, 2024 · 85b0631 · 85b0631
2 parents 89cf187 + d211078
commit 85b0631
Show file tree

Hide file tree

Showing 116 changed files with 5,723 additions and 6,440 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -37,7 +37,7 @@ jobs:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: make
         # build with TLS module just for compilation coverage
-        run: make SANITIZER=address SERVER_CFLAGS='-Werror -DDEBUG_ASSERTIONS' BUILD_TLS=module
+        run: make SANITIZER=address SERVER_CFLAGS='-Werror' BUILD_TLS=module
       - name: testprep
         run: sudo apt-get install tcl8.6 tclx -y
       - name: test
@@ -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'
 
diff --git a/.github/workflows/clang-format.yml b/.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 "ERROR: 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
diff --git a/.github/workflows/daily.yml b/.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'
@@ -598,7 +598,7 @@ jobs:
           repository: ${{ env.GITHUB_REPOSITORY }}
           ref: ${{ env.GITHUB_HEAD_REF }}
       - name: make
-        run: make all-with-unit-tests OPT=-O3 SANITIZER=address SERVER_CFLAGS='-DSERVER_TEST -Werror -DDEBUG_ASSERTIONS'
+        run: make all-with-unit-tests OPT=-O3 SANITIZER=address SERVER_CFLAGS='-DSERVER_TEST -Werror'
       - name: testprep
         run: |
           sudo apt-get update
@@ -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: |

diff --git a/.gitignore b/.gitignore
@@ -43,3 +43,7 @@ Makefile.dep
 compile_commands.json
 redis.code-workspace
 .cache
+.cscope*
+.swp
+nodes.conf
+tests/cluster/tmp/*
diff --git a/COPYING b/COPYING
@@ -1,5 +1,7 @@
 # License 1
 
+BSD 3-Clause License
+
 Copyright (c) 2024-present, Valkey contributors
 All rights reserved.
 
@@ -13,6 +15,8 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 
 # License 2
 
+BSD 3-Clause License
+
 Copyright (c) 2006-2020, Salvatore Sanfilippo
 All rights reserved.
 

diff --git a/src/Makefile b/src/Makefile
@@ -150,6 +150,11 @@ DEBUG=-g -ggdb
 # Linux ARM32 needs -latomic at linking time
 ifneq (,$(findstring armv,$(uname_M)))
         FINAL_LIBS+=-latomic
+else
+# Linux POWER needs -latomic at linking time
+ifneq (,$(findstring ppc,$(uname_M)))
+        FINAL_LIBS+=-latomic
+endif
 endif
 
 ifeq ($(uname_S),SunOS)