Merge branch 'unstable' into client-traffic-stat

.github/actions/generate-package-build-matrix/action.yml

@@ -0,0 +1,44 @@
+name: Generate target matrix.
+description: Matrix creation for building Valkey for different architectures and platforms.
+
+inputs:
+  ref:
+    description: The commit, tag or branch of Valkey to checkout to determine what version to use.
+    required: true
+outputs:
+  x86_64-build-matrix:
+    description: The x86_64 build matrix.
+    value: ${{ steps.set-matrix.outputs.x86matrix }}
+  arm64-build-matrix:
+    description: The arm64 build matrix.
+    value: ${{ steps.set-matrix.outputs.armmatrix }}
+
+runs:
+  using: "composite"
+  steps:
+    - name: Checkout code for version check
+      uses: actions/checkout@v4
+      with:
+        ref: ${{ inputs.ref }}
+        path: version-check
+
+    - name: Get targets
+      run: |
+        x86_arch=$(jq -c '[.linux_targets[] | select(.arch=="x86_64")]' utils/releasetools/build-config.json)
+        x86_matrix=$(echo "{ \"distro\" : $x86_arch }" | jq -c .)
+        echo "X86_MATRIX=$x86_matrix" >> $GITHUB_ENV
+
+        arm_arch=$(jq -c '[.linux_targets[] | select(.arch=="arm64")]' utils/releasetools/build-config.json)
+        arm_matrix=$(echo "{ \"distro\" : $arm_arch }" | jq -c .)
+        echo "ARM_MATRIX=$arm_matrix" >> $GITHUB_ENV
+      shell: bash
+
+    - id: set-matrix
+      run: |
+        echo $X86_MATRIX
+        echo $X86_MATRIX| jq .
+        echo "x86matrix=$X86_MATRIX" >> $GITHUB_OUTPUT
+        echo $ARM_MATRIX
+        echo $ARM_MATRIX| jq .
+        echo "armmatrix=$ARM_MATRIX" >> $GITHUB_OUTPUT
+      shell: bash

.github/workflows/build-release-packages.yml

@@ -0,0 +1,89 @@
+name: Build Release Packages
+
+on:
+  release:
+    types: [published]
+
+  workflow_dispatch:
+    inputs:
+      version:
+        description: Version of Valkey to build
+        required: true
+
+permissions:
+  contents: read
+
+jobs:
+  # This job provides the version metadata from the tag for the other jobs to use.
+  release-build-get-meta:
+    name: Get metadata to build
+    runs-on: ubuntu-latest
+    outputs:
+      version: ${{ steps.get_version.outputs.VERSION }}
+    steps:
+
+      - run: |
+          echo "Version: ${{ inputs.version || github.ref_name }}"
+        shell: bash
+
+      # This step is to consolidate the three different triggers into a single "version"
+      # 1. If manual dispatch - use the version provided.
+      # 3. If tag trigger, use that tag.
+      - name: Get the version
+        id: get_version
+        run: |
+          VERSION="${INPUT_VERSION}"
+          if [ -z "${VERSION}" ]; then
+            exit 1
+          fi
+          echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
+        shell: bash
+        env:
+          # Use the dispatch variable in preference, if empty use the context ref_name which should
+          # only ever be a tag
+          INPUT_VERSION: ${{ inputs.version || github.ref_name }}
+
+  generate-build-matrix:
+      name: Generating build matrix
+      runs-on: ubuntu-latest
+      outputs:
+        x86_64-build-matrix: ${{ steps.set-matrix.outputs.x86_64-build-matrix }}
+        arm64-build-matrix: ${{ steps.set-matrix.outputs.arm64-build-matrix }}
+      steps:
+        - name: Checkout repository
+          uses: actions/checkout@v4
+        # Set up the list of target to build so we can pass the JSON to the reusable job
+        - uses: ./.github/actions/generate-package-build-matrix
+          id: set-matrix
+          with:
+            ref: ${{ inputs.version || github.ref_name }}
+
+  release-build-linux-x86-packages:
+    needs:
+      - release-build-get-meta
+      - generate-build-matrix
+    uses: ./.github/workflows/call-build-linux-x86-packages.yml
+    with:
+      version: ${{ needs.release-build-get-meta.outputs.version }}
+      ref: ${{ inputs.version || github.ref_name }}
+      build_matrix: ${{ needs.generate-build-matrix.outputs.x86_64-build-matrix }}
+    secrets:
+      token: ${{ secrets.GITHUB_TOKEN }}
+      bucket: ${{ secrets.AWS_S3_BUCKET }}
+      access_key_id: ${{ secrets.AWS_S3_ACCESS_KEY_ID }}
+      secret_access_key: ${{ secrets.AWS_S3_ACCESS_KEY }}
+
+  release-build-linux-arm-packages:
+    needs:
+      - release-build-get-meta
+      - generate-build-matrix
+    uses: ./.github/workflows/call-build-linux-arm-packages.yml
+    with:
+      version: ${{ needs.release-build-get-meta.outputs.version }}
+      ref: ${{ inputs.version || github.ref_name }}
+      build_matrix: ${{ needs.generate-build-matrix.outputs.arm64-build-matrix }}
+    secrets:
+      token: ${{ secrets.GITHUB_TOKEN }}
+      bucket: ${{ secrets.AWS_S3_BUCKET }}
+      access_key_id: ${{ secrets.AWS_S3_ACCESS_KEY_ID }}
+      secret_access_key: ${{ secrets.AWS_S3_ACCESS_KEY }}

.github/workflows/call-build-linux-arm-packages.yml

@@ -0,0 +1,79 @@
+name: Builds Linux arm binary packages into S3 bucket.
+
+on:
+  workflow_call:
+    inputs:
+      version:
+        description: The version of Valkey to create.
+        type: string
+        required: true
+      ref:
+        description: The commit, tag or branch of Valkey to checkout for building that creates the version above.
+        type: string
+        required: true
+      build_matrix:
+        description: The build targets to produce as a JSON matrix.
+        type: string
+        required: true
+    secrets:
+      token:
+        description: The Github token or similar to authenticate with.
+        required: true
+      bucket:
+        description: The name of the S3 bucket to push packages into.
+        required: false
+      access_key_id:
+        description: The S3 access key id for the bucket.
+        required: false
+      secret_access_key:
+        description: The S3 secret access key for the bucket.
+        required: false
+
+permissions:
+  contents: read
+
+jobs:
+  build-valkey:
+    # Capture source tarball and generate checksum for it
+    name: Build package ${{ matrix.distro.target }} ${{ matrix.distro.arch }}
+    runs-on: 'ubuntu-latest'
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJSON(inputs.build_matrix) }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.version }}
+
+      - name: Make Valkey
+        uses: uraimo/run-on-arch-action@v2
+        with:
+          arch: aarch64
+          distro: ${{matrix.distro.target}}
+          install: apt-get update && apt-get install -y build-essential libssl-dev
+          run: make -C src all BUILD_TLS=yes
+
+      - name: Create Tarball and SHA256sums
+        run: |
+          TAR_FILE_NAME=valkey-${{inputs.version}}-${{matrix.distro.platform}}-${{ matrix.distro.arch}}
+          mkdir -p $TAR_FILE_NAME/bin $TAR_FILE_NAME/share
+          cp -rfv src/valkey-* $TAR_FILE_NAME/bin
+          cp -v /home/runner/work/valkey/valkey/COPYING $TAR_FILE_NAME/share/LICENSE
+          tar -czvf $TAR_FILE_NAME.tar.gz $TAR_FILE_NAME
+          sha256sum $TAR_FILE_NAME.tar.gz > $TAR_FILE_NAME.tar.gz.sha256
+          mkdir -p packages-files
+          cp -rfv $TAR_FILE_NAME.tar* packages-files/
+      
+      - name: Install AWS cli.
+        run: |
+          sudo apt-get install -y awscli
+
+      - name: Configure AWS credentials
+        run: |
+          aws configure set region us-west-2
+          aws configure set aws_access_key_id ${{ secrets.access_key_id }}
+          aws configure set aws_secret_access_key ${{ secrets.secret_access_key }}
+
+      - name: Sync to S3
+        run: aws s3 sync packages-files s3://${{secrets.bucket}}/releases/

.github/workflows/call-build-linux-x86-packages.yml

@@ -0,0 +1,73 @@
+name: Builds Linux X86 binary packages into S3 bucket.
+
+on:
+  workflow_call:
+    inputs:
+      version:
+        description: The version of Valkey to create.
+        type: string
+        required: true
+      ref:
+        description: The commit, tag or branch of Valkey to checkout for building that creates the version above.
+        type: string
+        required: true
+      build_matrix:
+        description: The build targets to produce as a JSON matrix.
+        type: string
+        required: true
+    secrets:
+      token:
+        description: The Github token or similar to authenticate with.
+        required: true
+      bucket:
+        description: The name of the S3 bucket to push packages into.
+        required: false
+      access_key_id:
+        description: The S3 access key id for the bucket.
+        required: false
+      secret_access_key:
+        description: The S3 secret access key for the bucket.
+        required: false
+
+permissions:
+  contents: read
+
+jobs:
+  build-valkey:
+    # Capture source tarball and generate checksum for it
+    name: Build package ${{ matrix.distro.target }} ${{ matrix.distro.arch }}
+    runs-on: 'ubuntu-latest'
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJSON(inputs.build_matrix) }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.version }}
+
+      - name: Install dependencies
+        run: sudo apt-get update && sudo apt-get install -y build-essential libssl-dev jq wget awscli
+
+      - name: Make Valkey
+        run: make -C src all BUILD_TLS=yes
+
+      - name: Create Tarball and SHA256sums
+        run: |
+          TAR_FILE_NAME=valkey-${{inputs.version}}-${{matrix.distro.platform}}-${{ matrix.distro.arch}}
+          mkdir -p $TAR_FILE_NAME/bin $TAR_FILE_NAME/share
+          cp -rfv src/valkey-* $TAR_FILE_NAME/bin
+          cp -v /home/runner/work/valkey/valkey/COPYING $TAR_FILE_NAME/share/LICENSE
+          tar -czvf $TAR_FILE_NAME.tar.gz $TAR_FILE_NAME
+          sha256sum $TAR_FILE_NAME.tar.gz > $TAR_FILE_NAME.tar.gz.sha256
+          mkdir -p packages-files
+          cp -rfv $TAR_FILE_NAME.tar* packages-files/
+
+      - name: Configure AWS credentials
+        run: |
+          aws configure set region us-west-2
+          aws configure set aws_access_key_id ${{ secrets.access_key_id }}
+          aws configure set aws_secret_access_key ${{ secrets.secret_access_key }}
+
+      - name: Sync to S3
+        run: aws s3 sync packages-files s3://${{secrets.bucket}}/releases/

src/acl.c

@@ -2572,11 +2572,11 @@ int ACLSaveToFile(const char *filename) {
 void ACLLoadUsersAtStartup(void) {
     if (server.acl_filename[0] != '\0' && listLength(UsersToLoad) != 0) {
         serverLog(LL_WARNING,
-            "Configuring Redis with users defined in redis.conf and at "
+            "Configuring %s with users defined in valkey.conf and at "
             "the same setting an ACL file path is invalid. This setup "
             "is very likely to lead to configuration errors and security "
             "holes, please define either an ACL file or declare users "
-            "directly in your redis.conf, but not both.");
+            "directly in your valkey.conf, but not both.", SERVER_TITLE);
         exit(1);
     }
 
@@ -2590,7 +2590,7 @@ void ACLLoadUsersAtStartup(void) {
         sds errors = ACLLoadFromFile(server.acl_filename);
         if (errors) {
             serverLog(LL_WARNING,
-                "Aborting Redis startup because of ACL errors: %s", errors);
+                "Aborting %s startup because of ACL errors: %s", SERVER_TITLE, errors);
             sdsfree(errors);
             exit(1);
         }
@@ -2999,7 +2999,7 @@ void aclCommand(client *c) {
     } else if (server.acl_filename[0] == '\0' &&
                (!strcasecmp(sub,"load") || !strcasecmp(sub,"save")))
     {
-        addReplyError(c,"This Redis instance is not configured to use an ACL file. You may want to specify users via the ACL SETUSER command and then issue a CONFIG REWRITE (assuming you have a Redis configuration file set) in order to store users in the Redis configuration.");
+        addReplyError(c,"This instance is not configured to use an ACL file. You may want to specify users via the ACL SETUSER command and then issue a CONFIG REWRITE (assuming you have a configuration file set) in order to store users in the configuration.");
         return;
     } else if (!strcasecmp(sub,"load") && c->argc == 2) {
         sds errors = ACLLoadFromFile(server.acl_filename);

src/cluster_legacy.c

@@ -791,7 +791,7 @@ int clusterLockConfig(char *filename) {
         if (errno == EWOULDBLOCK) {
             serverLog(LL_WARNING,
                  "Sorry, the cluster configuration file %s is already used "
-                 "by a different Redis Cluster node. Please make sure that "
+                 "by a different Cluster node. Please make sure that "
                  "different nodes use different cluster configuration "
                  "files.", filename);
         } else {
@@ -1011,10 +1011,10 @@ void clusterInit(void) {
      * us from trying to use a too-high cluster port number. */
     int port = defaultClientPort();
     if (!server.cluster_port && port > (65535-CLUSTER_PORT_INCR)) {
-        serverLog(LL_WARNING, "Redis port number too high. "
+        serverLog(LL_WARNING, "%s port number too high. "
                    "Cluster communication port is 10,000 port "
-                   "numbers higher than your Redis port. "
-                   "Your Redis port number must be 55535 or less.");
+                   "numbers higher than your %s port. "
+                   "Your %s port number must be 55535 or less.", SERVER_TITLE, SERVER_TITLE, SERVER_TITLE);
         exit(1);
     }
     if (!server.bindaddr_count) {
@@ -1055,7 +1055,7 @@ void clusterInitLast(void) {
     }
 
     if (createSocketAcceptHandler(&server.clistener, clusterAcceptHandler) != C_OK) {
-        serverPanic("Unrecoverable error creating Redis Cluster socket accept handler.");
+        serverPanic("Unrecoverable error creating Cluster socket accept handler.");
     }
 }
 

src/config.c

@@ -2339,8 +2339,8 @@ static int isValidActiveDefrag(int val, const char **err) {
 #ifndef HAVE_DEFRAG
     if (val) {
         *err = "Active defragmentation cannot be enabled: it "
-               "requires a Redis server compiled with a modified Jemalloc "
-               "like the one shipped by default with the Redis source "
+               "requires a server compiled with a modified Jemalloc "
+               "like the one shipped by default with the source "
                "distribution";
         return 0;
     }
@@ -2564,7 +2564,7 @@ static int updateMaxclients(const char **err) {
         if (aeResizeSetSize(server.el,
             server.maxclients + CONFIG_FDSET_INCR) == AE_ERR)
         {
-            *err = "The event loop API used by Redis is not able to handle the specified number of clients";
+            *err = "The event loop API is not able to handle the specified number of clients";
             return 0;
         }
     }

src/eval.c

@@ -888,7 +888,7 @@ int ldbStartSession(client *c) {
             /* Log the creation of the child and close the listening
              * socket to make sure if the parent crashes a reset is sent
              * to the clients. */
-            serverLog(LL_NOTICE,"Redis forked for debugging eval");
+            serverLog(LL_NOTICE,"%s forked for debugging eval", SERVER_TITLE);
         } else {
             /* Parent */
             listAddNodeTail(ldb.children,(void*)(unsigned long)cp);
@@ -897,7 +897,7 @@ int ldbStartSession(client *c) {
         }
     } else {
         serverLog(LL_NOTICE,
-            "Redis synchronous debugging eval session started");
+            "%s synchronous debugging eval session started", SERVER_TITLE);
     }
 
     /* Setup our debugging session. */
@@ -934,7 +934,7 @@ void ldbEndSession(client *c) {
         exitFromChild(0);
     } else {
         serverLog(LL_NOTICE,
-            "Redis synchronous debugging eval session ended");
+            "%s synchronous debugging eval session ended", SERVER_TITLE);
     }
 
     /* Otherwise let's restore client's state. */