set version to 6.3.4

* fix auditlog test titles, and enable tls tests for CI

* fix tls auditlog key string

build.yaml

@@ -3,7 +3,7 @@ version: 1
 machamp:
   keydb-build:
     # Optional - build counter is linked to the build def
-    tag_template: 0.0.%build.counter%
+    tag_template: "0.0.%build.counter%-%sha%"
     # Optional - value in seconds before a build is terminated, default is 3600 seconds
     timeout: 3600
     # Optional - update ghe or not, default to true
@@ -21,13 +21,13 @@ machamp:
         parent: make-build
         # https://github.sc-corp.net/Snapchat/img/tree/master/keydb/ubuntu-20-04
         builder_image: us.gcr.io/snapchat-build-artifacts/prod/snapchat/img/keydb/keydb-ubuntu-20-04@sha256:cf869a3f5d1de1e1d976bb906689c37b7031938eb68661b844a38c532f27248c
-        command: ./runtest --clients 4 --verbose 
+        command: ./runtest --clients 4 --verbose --tls
       cluster-test:
         type: cmd
         parent: make-build
         # https://github.sc-corp.net/Snapchat/img/tree/master/keydb/ubuntu-20-04
         builder_image: us.gcr.io/snapchat-build-artifacts/prod/snapchat/img/keydb/keydb-ubuntu-20-04@sha256:cf869a3f5d1de1e1d976bb906689c37b7031938eb68661b844a38c532f27248c
-        command: ./runtest-cluster 
+        command: ./runtest-cluster --tls
       sentinel-test:
         type: cmd
         parent: make-build
@@ -46,8 +46,25 @@ machamp:
         # https://github.sc-corp.net/Snapchat/img/tree/master/keydb/ubuntu-20-04
         builder_image: us.gcr.io/snapchat-build-artifacts/prod/snapchat/img/keydb/keydb-ubuntu-20-04@sha256:cf869a3f5d1de1e1d976bb906689c37b7031938eb68661b844a38c532f27248c
         command: ./runtest-rotation
-      keyproxy-test:
+  keydb-docker-build:
+    # Optional - build counter is linked to the build def
+    tag_template: "%sha%"
+    # Optional - value in seconds before a build is terminated, default is 3600 seconds
+    timeout: 3600
+    # Optional - update ghe or not, default to true
+    update_ghe: true
+    code_coverage: false
+    # Required
+    steps:
+      # to ensure a clearer docker build env
+      code-checkout:
         type: cmd
-        parent: make-build
-        command: ./runtest-keyproxy --tls
-        builder_image: us.gcr.io/snapchat-build-artifacts/prod/snapchat/img/keydb/keydb-ubuntu-20-04@sha256:cf869a3f5d1de1e1d976bb906689c37b7031938eb68661b844a38c532f27248c
+        command: echo checkout
+        # default machamp builder image does not work for multi arch
+        builder_image: us.gcr.io/snapchat-build-artifacts/prod/snapchat/img/ubuntu/ubuntu-23-04@sha256:bd43177a80e6ce1c3583e8ea959b88a9081c0f56b765ec9c5a157c27a637c23b
+      docker:
+        parent: code-checkout
+        type: docker # published images can be found in https://console.cloud.google.com/gcr/images/machamp-prod/global/keydb
+        dockerfile: machamp_scripts/Dockerfile
+        image_name: keydb # git commit sha will be deafult tag in the final image
+        workspace_context: ./ # This is the workspace context that your Dockerfile will use to move files around. <Root of checkout repository>/<Workspace Context>/<Dockerfile> If the workspace context is just the root of the repository, you can just use "./".

ci.yaml

@@ -1,16 +1,35 @@
 # Doc: https://wiki.sc-corp.net/display/TOOL/ci.yaml+User+Guide
 version: 1
 on:
+  # https://wiki.sc-corp.net/display/TOOL/Onboard+Machamp+Build+By+ci.yaml+Configuration
+  # on pull_request is used for any pr build
   pull_request:
-    - workflows:
-      # All builds that use machamp should use the defined `backend_workflow`
-      - workflow_type: backend_workflow
-        # references a build defined in build.yaml
-        build_name: keydb-build
-        arch_types: ["amd64", "arm64"]
+    - branches: ['!!main', '*'] # this branch pattern means any branch but not main branch will trigger this pr build
+      workflows:
+        # All builds that use machamp should use the defined `backend_workflow`
+        - workflow_type: backend_workflow
+          # references a build defined in build.yaml
+          build_name: keydb-build
+          arch_types: ["amd64", "arm64"]
+        - workflow_type: backend_workflow
+          # references a build defined in build.yaml
+          build_name: keydb-docker-build
+          arch_types: ["amd64", "arm64"]
+  # on push is used for release branch, meaning: trigger this build when there is commit pushed to this branch
   push:
     - branches: [main]
       workflows:
         - workflow_type: backend_workflow
           build_name: keydb-build
           arch_types: ["amd64", "arm64"]
+        - workflow_type: backend_workflow
+          # references a build defined in build.yaml
+          build_name: keydb-docker-build
+          arch_types: ["amd64", "arm64"]
+
+# below defines which branch is release branch / release tag
+machamp:
+  releases:
+    # Note: machamp will only respect the ci.yaml file from default branch for "release branch" definition (most repositories using master/main as default branch)
+    # https://wiki.sc-corp.net/display/TOOL/Onboard+Machamp+Build+By+ci.yaml+Configuration
+    - branch_name: ^main$

deps/cpp-statsd-client/.clang-format

@@ -0,0 +1,105 @@
+AccessModifierOffset: -4
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortFunctionsOnASingleLine: Empty
+BinPackArguments: false
+BinPackParameters: false
+ColumnLimit:     120
+IndentCaseLabels: false
+IndentWidth:     4
+
+---
+Language:        Cpp
+# BasedOnStyle:  Google
+#AccessModifierOffset: -1
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlinesLeft: true
+AlignOperands:   true
+AlignTrailingComments: true
+#AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+#AllowShortFunctionsOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: true
+AllowShortLoopsOnASingleLine: true
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: true
+AlwaysBreakTemplateDeclarations: true
+#BinPackArguments: true
+#BinPackParameters: true
+BraceWrapping:
+  AfterClass:      false
+  AfterControlStatement: false
+  AfterEnum:       false
+  AfterFunction:   false
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     false
+  AfterUnion:      false
+  BeforeCatch:     false
+  BeforeElse:      false
+  IndentBraces:    false
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Attach
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: true
+#ColumnLimit:     80
+CommentPragmas:  '^ IWYU pragma:'
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: true
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: false
+ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+IncludeCategories:
+  - Regex:           '^<.*\.h>'
+    Priority:        1
+  - Regex:           '^<.*'
+    Priority:        2
+  - Regex:           '.*'
+    Priority:        3
+IncludeIsMainRegex: '([-_](test|unittest))?$'
+#IndentCaseLabels: true
+#IndentWidth:     2
+IndentWrappedFunctionNames: false
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBlockIndentWidth: 2
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: false
+PenaltyBreakBeforeFirstCallParameter: 1
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 200
+PointerAlignment: Left
+ReflowComments:  true
+SortIncludes:    true
+SpaceAfterCStyleCast: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 2
+SpacesInAngles:  false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard:        Auto
+TabWidth:        8
+UseTab:          Never
+...
+

deps/cpp-statsd-client/.github/workflows/coverage.yml

@@ -0,0 +1,30 @@
+name: Coverage
+
+on: [push, pull_request]
+jobs:
+  coverage:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: dependencies
+        shell: bash
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y -qq make cmake gcc g++ lcov bc
+      - name: build
+        shell: bash
+        run: |
+          export LD_LIBRARY_PATH=.:$(cat /etc/ld.so.conf.d/* | grep -vF "#" | tr "\\n" ":" | sed -e "s/:$//g")
+          cmake . -DCMAKE_BUILD_TYPE=Debug -DENABLE_COVERAGE=On
+          make all -j$(nproc)
+      - name: coverage
+        shell: bash
+        run: |
+          make coverage
+          lines=$(lcov --summary coverage.info | grep -F lines | awk '{print $2}' | sed -e "s/%//g")
+          if (( $(echo "${lines} < ${COVERAGE_THRESHOLD}" | bc -l) )); then
+              echo "Line coverage dropped below ${COVERAGE_THRESHOLD}% to ${lines}%"
+              exit 1
+          fi
+        env:
+          COVERAGE_THRESHOLD: 85.0

deps/cpp-statsd-client/.github/workflows/lint.yml

@@ -0,0 +1,13 @@
+name: Lint
+
+on: [push, pull_request]
+jobs:
+  lint:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: lint
+        uses: DoozyX/clang-format-lint-action@v0.12
+        with:
+          clangFormatVersion: 12
+          source: './include/cpp-statsd-client ./tests'

deps/cpp-statsd-client/.github/workflows/linux.yml

@@ -0,0 +1,23 @@
+name: Linux
+
+on: [push, pull_request]
+jobs:
+  linux:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: dependencies
+        shell: bash
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y -qq make cmake gcc g++
+      - name: build
+        shell: bash
+        run: |
+          export LD_LIBRARY_PATH=.:$(cat /etc/ld.so.conf.d/* | grep -vF "#" | tr "\\n" ":" | sed -e "s/:$//g")
+          cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_SANITIZERS=On
+          make all -j$(nproc)
+      - name: test
+        shell: bash
+        run: |
+          make test

deps/cpp-statsd-client/.github/workflows/windows.yml

@@ -0,0 +1,18 @@
+name: Windows
+
+on: [push, pull_request]
+jobs:
+  windows:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: dependencies
+        run: |
+          choco install cmake
+      - name: build
+        run: |
+          cmake -S . -B build -G "Visual Studio 16 2019" -A x64
+          cmake --build build --target ALL_BUILD --config Release
+      - name: test
+        run: |
+          cmake --build build --target RUN_TESTS --config Release

deps/cpp-statsd-client/.gitignore

@@ -0,0 +1 @@
+bin

deps/cpp-statsd-client/CMakeLists.txt

@@ -0,0 +1,85 @@
+# Basic project setup
+cmake_minimum_required(VERSION 3.5)
+project(cpp-statsd-client
+        VERSION 1.0.2
+        LANGUAGES CXX
+        DESCRIPTION "A header-only StatsD client implemented in C++"
+        HOMEPAGE_URL "https://github.com/vthiery/cpp-statsd-client")
+
+option(CPP_STATSD_STANDALONE "Allows configuration of targets for verifying library functionality" ON)
+option(ENABLE_TESTS "Build tests" ON)
+option(ENABLE_COVERAGE "Build with coverage instrumentalisation" OFF)
+
+if(NOT CPP_STATSD_STANDALONE)
+  set(ENABLE_TESTS OFF)
+  set(ENABLE_COVERAGE OFF)
+endif()
+
+include(GNUInstallDirs)
+include(CMakePackageConfigHelpers)
+find_package(Threads)
+
+# Optional code coverage targets
+if(ENABLE_COVERAGE)
+  set(COVERAGE_EXCLUDES /usr/*)
+  include(${PROJECT_SOURCE_DIR}/cmake/CodeCoverage.cmake)
+  APPEND_COVERAGE_COMPILER_FLAGS()
+  SETUP_TARGET_FOR_COVERAGE_LCOV(NAME coverage
+                                 EXECUTABLE testStatsdClient
+                                 DEPENDENCIES ${PROJECT_NAME}
+  )
+endif()
+
+# The library target
+add_library(${PROJECT_NAME} INTERFACE)
+target_include_directories(
+  ${PROJECT_NAME}
+  INTERFACE $<BUILD_INTERFACE:${${PROJECT_NAME}_SOURCE_DIR}/include>
+            $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+target_link_libraries(${PROJECT_NAME} INTERFACE Threads::Threads)
+if(WIN32)
+  target_link_libraries(${PROJECT_NAME} INTERFACE ws2_32)
+endif()
+
+# The installation and pkg-config-like cmake config
+install(TARGETS ${PROJECT_NAME}
+        EXPORT ${PROJECT_NAME}_Targets
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
+                                 VERSION ${PROJECT_VERSION}
+                                 COMPATIBILITY SameMajorVersion)
+configure_package_config_file(
+  "${PROJECT_SOURCE_DIR}/cmake/${PROJECT_NAME}Config.cmake.in"
+  "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
+  INSTALL_DESTINATION
+  ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake)
+install(EXPORT ${PROJECT_NAME}_Targets
+        FILE ${PROJECT_NAME}Targets.cmake
+        NAMESPACE ${PROJECT_NAME}::
+        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake)
+install(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
+              "${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
+        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake)
+install(DIRECTORY ${PROJECT_SOURCE_DIR}/include DESTINATION include)
+
+if(ENABLE_TESTS)
+  # The test targets
+  add_executable(testStatsdClient ${CMAKE_CURRENT_SOURCE_DIR}/tests/testStatsdClient.cpp)
+  if(WIN32)
+    target_compile_options(testStatsdClient PRIVATE -W4 -WX /external:W0)
+  else()
+    target_compile_options(testStatsdClient PRIVATE -Wall -Wextra -pedantic -Werror)
+  endif()
+  target_include_directories(testStatsdClient PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests)
+  target_link_libraries(testStatsdClient ${PROJECT_NAME})
+
+  set_property(TARGET testStatsdClient PROPERTY CXX_STANDARD 11)
+  set_property(TARGET testStatsdClient PROPERTY CXX_EXTENSIONS OFF)
+
+  # The test suite
+  enable_testing()
+  add_test(ctestTestStatsdClient testStatsdClient)
+  add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} DEPENDS testStatsdClient)
+endif()

deps/cpp-statsd-client/LICENSE.md

@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) 2017 Vincent Thiery
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

deps/cpp-statsd-client/Makefile

@@ -0,0 +1,22 @@
+# simple makefile to build, test and clean
+
+BUILD_MODE ?= Release
+ENABLE_COVERAGE ?= On
+
+build: clean
+	@echo "Build in ${BUILD_MODE} mode"
+	mkdir -p bin/${BUILD_MODE}
+	@cd bin/${BUILD_MODE}; cmake ../../ -DCMAKE_BUILD_TYPE=${BUILD_MODE} -DENABLE_COVERAGE=${ENABLE_COVERAGE}
+	@cd bin/${BUILD_MODE}; make
+
+test: build
+	@cd bin/${BUILD_MODE}; make test
+
+coverage: build
+	@cd bin/${BUILD_MODE}; make coverage
+
+install: build
+	@cd bin/${BUILD_MODE}; make install
+
+clean:
+	@rm -rf bin

deps/cpp-statsd-client/README.md

@@ -0,0 +1,150 @@
+# C++ StatsD Client
+
+![logo](https://raw.githubusercontent.com/vthiery/cpp-statsd-client/master/images/logo.svg?sanitize=true)
+
+[![Release](https://img.shields.io/github/release/vthiery/cpp-statsd-client.svg?style=for-the-badge)](https://github.com/vthiery/cpp-statsd-client/releases/latest)
+![License](https://img.shields.io/github/license/vthiery/cpp-statsd-client?style=for-the-badge)
+[![Linux status](https://img.shields.io/github/workflow/status/vthiery/cpp-statsd-client/Linux?label=Linux&style=for-the-badge)](https://github.com/vthiery/cpp-statsd-client/actions/workflows/linux.yml?query=branch%3Amaster++)
+[![Windows status](https://img.shields.io/github/workflow/status/vthiery/cpp-statsd-client/Windows?label=Windows&style=for-the-badge)](https://github.com/vthiery/cpp-statsd-client/actions/workflows/windows.yml?query=branch%3Amaster++)
+
+A header-only StatsD client implemented in C++.
+The client allows:
+
+- batching,
+- change of configuration at runtime,
+- user-defined frequency rate.
+
+## Install and Test
+
+### Makefile
+
+In order to install the header files and/or run the tests, simply use the Makefile and execute
+
+```sh
+make install
+```
+
+and
+
+```sh
+make test
+```
+
+### Conan
+
+If you are using [Conan](https://www.conan.io/) to manage your dependencies, merely add statsdclient/x.y.z@vthiery/stable to your conanfile.py's requires, where x.y.z is the release version you want to use. Please file issues here if you experience problems with the packages. You can also directly download the latest version [here](https://bintray.com/vthiery/conan-packages/statsdclient%3Avthiery/_latestVersion).
+
+## Usage
+
+### Example
+
+A simple example of how to use the client:
+
+```cpp
+#include "StatsdClient.hpp"
+using namespace Statsd;
+
+int main() {
+    // Define the client on localhost, with port 8080,
+    // using a prefix,
+    // a batching size of 20 bytes,
+    // and three points of precision for floating point gauge values
+    StatsdClient client{ "127.0.0.1", 8080, "myPrefix", 20, 3 };
+
+    // Increment the metric "coco"
+    client.increment("coco");
+
+    // Decrement the metric "kiki"
+    client.decrement("kiki");
+
+    // Adjusts "toto" by +3
+    client.count("toto", 2, 0.1f);
+
+    // Record a gauge "titi" to 3
+    client.gauge("titi", 3);
+
+    // Record a timing of 2ms for "myTiming"
+    client.timing("myTiming", 2, 0.1f);
+
+    // Send a metric explicitly
+    client.send("tutu", 4, "c", 2.0f);
+    exit(0);
+}
+```
+
+### Advanced Testing
+
+A simple mock StatsD server can be found at `tests/StatsdServer.hpp`. This can be used to do simple validation of your application's metrics, typically in the form of unit tests. In fact this is the primary means by which this library is tested. The mock server itself is not distributed with the library so to use it you'd need to vendor this project into your project. Once you have though, you can test your application's use of the client like so:
+
+```cpp
+#include "StatsdClient.hpp"
+#include "StatsdServer.hpp"
+
+#include <cassert>
+
+using namespace Statsd;
+
+struct MyApp {
+    void doWork() const {
+        m_client.count("bar", 3);
+    }
+private:
+    StatsdClient m_client{"localhost", 8125, "foo"};
+};
+
+int main() {
+    StatsdServer mockServer;
+
+    MyApp app;
+    app.doWork();
+
+    assert(mockServer.receive() == "foo.bar:3|c");
+    exit(0);
+}
+```
+
+### Configuration
+
+The configuration of the client must be input when one instantiates it. Nevertheless, the API allows the configuration ot change afterwards. For example, one can do the following:
+
+```cpp
+#include "StatsdClient.hpp"
+using namespace Statsd;
+
+int main()
+{
+    // Define the client on localhost, with port 8080,
+    // using a prefix,
+    // a batching size of 20 bytes,
+    // and three points of precision for floating point gauge values
+    StatsdClient client{ "127.0.0.1", 8080, "myPrefix", 20, 3 };
+
+    client.increment("coco");
+
+    // Set a new configuration, using a different port, a different prefix, and more gauge precision
+    client.setConfig("127.0.0.1", 8000, "anotherPrefix", 6);
+
+    client.decrement("kiki");
+}
+```
+
+The batchsize is the only parameter that cannot be changed for the time being.
+
+### Batching
+
+The client supports batching of the metrics. The batch size parameter is the number of bytes to allow in each batch (UDP datagram payload) to be sent to the statsd process. This number is not a hard limit. If appending the current stat to the current batch (separated by the `'\n'` character) pushes the current batch over the batch size, that batch is enqueued (not sent) and a new batch is started. If batch size is 0, the default, then each stat is sent individually to the statsd process and no batches are enqueued.
+
+### Sending
+
+As previously mentioned, if batching is disabled (by setting the batch size to 0) then every stat is sent immediately in a blocking fashion. If batching is enabled (ie non-zero) then you may also set the send interval. The send interval controls the time, in milliseconds, to wait before flushing/sending the queued stats batches to the statsd process. When the send interval is non-zero a background thread is spawned which will do the flushing/sending at the configured send interval, in other words asynchronously. The queuing mechanism in this case is *not* lock-free. If batching is enabled but the send interval is set to zero then the queued batchs of stats will not be sent automatically by a background thread but must be sent manually via the `flush` method. The `flush` method is a blocking call.
+
+
+### Frequency rate
+
+When sending a metric, a frequency rate can be set in order to limit the metrics' sampling. By default, the frequency rate is set to one and won't affect the sampling. If set to a value `epsilon` (0.0001 for the time being) close to one, the sampling is not affected either.
+
+If the frequency rate is set and `epsilon` different from one, the sending will be rejected randomly (the higher the frequency rate, the lower the probability of rejection).
+
+## License
+
+This library is under MIT license.

deps/cpp-statsd-client/cmake/CodeCoverage.cmake

@@ -0,0 +1,708 @@
+# Copyright (c) 2012 - 2017, Lars Bilke
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice, this
+#    list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# 3. Neither the name of the copyright holder nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without
+#    specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# CHANGES:
+#
+# 2012-01-31, Lars Bilke
+# - Enable Code Coverage
+#
+# 2013-09-17, Joakim Söderberg
+# - Added support for Clang.
+# - Some additional usage instructions.
+#
+# 2016-02-03, Lars Bilke
+# - Refactored functions to use named parameters
+#
+# 2017-06-02, Lars Bilke
+# - Merged with modified version from github.com/ufz/ogs
+#
+# 2019-05-06, Anatolii Kurotych
+# - Remove unnecessary --coverage flag
+#
+# 2019-12-13, FeRD (Frank Dana)
+# - Deprecate COVERAGE_LCOVR_EXCLUDES and COVERAGE_GCOVR_EXCLUDES lists in favor
+#   of tool-agnostic COVERAGE_EXCLUDES variable, or EXCLUDE setup arguments.
+# - CMake 3.4+: All excludes can be specified relative to BASE_DIRECTORY
+# - All setup functions: accept BASE_DIRECTORY, EXCLUDE list
+# - Set lcov basedir with -b argument
+# - Add automatic --demangle-cpp in lcovr, if 'c++filt' is available (can be
+#   overridden with NO_DEMANGLE option in setup_target_for_coverage_lcovr().)
+# - Delete output dir, .info file on 'make clean'
+# - Remove Python detection, since version mismatches will break gcovr
+# - Minor cleanup (lowercase function names, update examples...)
+#
+# 2019-12-19, FeRD (Frank Dana)
+# - Rename Lcov outputs, make filtered file canonical, fix cleanup for targets
+#
+# 2020-01-19, Bob Apthorpe
+# - Added gfortran support
+#
+# 2020-02-17, FeRD (Frank Dana)
+# - Make all add_custom_target()s VERBATIM to auto-escape wildcard characters
+#   in EXCLUDEs, and remove manual escaping from gcovr targets
+#
+# 2021-01-19, Robin Mueller
+# - Add CODE_COVERAGE_VERBOSE option which will allow to print out commands which are run
+# - Added the option for users to set the GCOVR_ADDITIONAL_ARGS variable to supply additional
+#   flags to the gcovr command
+#
+# 2020-05-04, Mihchael Davis
+#     - Add -fprofile-abs-path to make gcno files contain absolute paths
+#     - Fix BASE_DIRECTORY not working when defined
+#     - Change BYPRODUCT from folder to index.html to stop ninja from complaining about double defines
+#
+# 2021-05-10, Martin Stump
+#     - Check if the generator is multi-config before warning about non-Debug builds
+#
+# USAGE:
+#
+# 1. Copy this file into your cmake modules path.
+#
+# 2. Add the following line to your CMakeLists.txt (best inside an if-condition
+#    using a CMake option() to enable it just optionally):
+#      include(CodeCoverage)
+#
+# 3. Append necessary compiler flags:
+#      append_coverage_compiler_flags()
+#
+# 3.a (OPTIONAL) Set appropriate optimization flags, e.g. -O0, -O1 or -Og
+#
+# 4. If you need to exclude additional directories from the report, specify them
+#    using full paths in the COVERAGE_EXCLUDES variable before calling
+#    setup_target_for_coverage_*().
+#    Example:
+#      set(COVERAGE_EXCLUDES
+#          '${PROJECT_SOURCE_DIR}/src/dir1/*'
+#          '/path/to/my/src/dir2/*')
+#    Or, use the EXCLUDE argument to setup_target_for_coverage_*().
+#    Example:
+#      setup_target_for_coverage_lcov(
+#          NAME coverage
+#          EXECUTABLE testrunner
+#          EXCLUDE "${PROJECT_SOURCE_DIR}/src/dir1/*" "/path/to/my/src/dir2/*")
+#
+# 4.a NOTE: With CMake 3.4+, COVERAGE_EXCLUDES or EXCLUDE can also be set
+#     relative to the BASE_DIRECTORY (default: PROJECT_SOURCE_DIR)
+#     Example:
+#       set(COVERAGE_EXCLUDES "dir1/*")
+#       setup_target_for_coverage_gcovr_html(
+#           NAME coverage
+#           EXECUTABLE testrunner
+#           BASE_DIRECTORY "${PROJECT_SOURCE_DIR}/src"
+#           EXCLUDE "dir2/*")
+#
+# 5. Use the functions described below to create a custom make target which
+#    runs your test executable and produces a code coverage report.
+#
+# 6. Build a Debug build:
+#      cmake -DCMAKE_BUILD_TYPE=Debug ..
+#      make
+#      make my_coverage_target
+#
+
+include(CMakeParseArguments)
+
+option(CODE_COVERAGE_VERBOSE "Verbose information" FALSE)
+
+# Check prereqs
+find_program( GCOV_PATH gcov )
+find_program( LCOV_PATH  NAMES lcov lcov.bat lcov.exe lcov.perl)
+find_program( FASTCOV_PATH NAMES fastcov fastcov.py )
+find_program( GENHTML_PATH NAMES genhtml genhtml.perl genhtml.bat )
+find_program( GCOVR_PATH gcovr PATHS ${CMAKE_SOURCE_DIR}/scripts/test)
+find_program( CPPFILT_PATH NAMES c++filt )
+
+if(NOT GCOV_PATH)
+    message(FATAL_ERROR "gcov not found! Aborting...")
+endif() # NOT GCOV_PATH
+
+get_property(LANGUAGES GLOBAL PROPERTY ENABLED_LANGUAGES)
+list(GET LANGUAGES 0 LANG)
+
+if("${CMAKE_${LANG}_COMPILER_ID}" MATCHES "(Apple)?[Cc]lang")
+    if("${CMAKE_${LANG}_COMPILER_VERSION}" VERSION_LESS 3)
+        message(FATAL_ERROR "Clang version must be 3.0.0 or greater! Aborting...")
+    endif()
+elseif(NOT CMAKE_COMPILER_IS_GNUCXX)
+    if("${CMAKE_Fortran_COMPILER_ID}" MATCHES "[Ff]lang")
+        # Do nothing; exit conditional without error if true
+    elseif("${CMAKE_Fortran_COMPILER_ID}" MATCHES "GNU")
+        # Do nothing; exit conditional without error if true
+    else()
+        message(FATAL_ERROR "Compiler is not GNU gcc! Aborting...")
+    endif()
+endif()
+
+set(COVERAGE_COMPILER_FLAGS "-g -fprofile-arcs -ftest-coverage"
+    CACHE INTERNAL "")
+if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
+    include(CheckCXXCompilerFlag)
+    check_cxx_compiler_flag(-fprofile-abs-path HAVE_fprofile_abs_path)
+    if(HAVE_fprofile_abs_path)
+        set(COVERAGE_COMPILER_FLAGS "${COVERAGE_COMPILER_FLAGS} -fprofile-abs-path")
+    endif()
+endif()
+
+set(CMAKE_Fortran_FLAGS_COVERAGE
+    ${COVERAGE_COMPILER_FLAGS}
+    CACHE STRING "Flags used by the Fortran compiler during coverage builds."
+    FORCE )
+set(CMAKE_CXX_FLAGS_COVERAGE
+    ${COVERAGE_COMPILER_FLAGS}
+    CACHE STRING "Flags used by the C++ compiler during coverage builds."
+    FORCE )
+set(CMAKE_C_FLAGS_COVERAGE
+    ${COVERAGE_COMPILER_FLAGS}
+    CACHE STRING "Flags used by the C compiler during coverage builds."
+    FORCE )
+set(CMAKE_EXE_LINKER_FLAGS_COVERAGE
+    ""
+    CACHE STRING "Flags used for linking binaries during coverage builds."
+    FORCE )
+set(CMAKE_SHARED_LINKER_FLAGS_COVERAGE
+    ""
+    CACHE STRING "Flags used by the shared libraries linker during coverage builds."
+    FORCE )
+mark_as_advanced(
+    CMAKE_Fortran_FLAGS_COVERAGE
+    CMAKE_CXX_FLAGS_COVERAGE
+    CMAKE_C_FLAGS_COVERAGE
+    CMAKE_EXE_LINKER_FLAGS_COVERAGE
+    CMAKE_SHARED_LINKER_FLAGS_COVERAGE )
+
+get_property(GENERATOR_IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+if(NOT (CMAKE_BUILD_TYPE STREQUAL "Debug" OR GENERATOR_IS_MULTI_CONFIG))
+    message(WARNING "Code coverage results with an optimised (non-Debug) build may be misleading")
+endif() # NOT (CMAKE_BUILD_TYPE STREQUAL "Debug" OR GENERATOR_IS_MULTI_CONFIG)
+
+if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
+    link_libraries(gcov)
+endif()
+
+# Defines a target for running and collection code coverage information
+# Builds dependencies, runs the given executable and outputs reports.
+# NOTE! The executable should always have a ZERO as exit code otherwise
+# the coverage generation will not complete.
+#
+# setup_target_for_coverage_lcov(
+#     NAME testrunner_coverage                    # New target name
+#     EXECUTABLE testrunner -j ${PROCESSOR_COUNT} # Executable in PROJECT_BINARY_DIR
+#     DEPENDENCIES testrunner                     # Dependencies to build first
+#     BASE_DIRECTORY "../"                        # Base directory for report
+#                                                 #  (defaults to PROJECT_SOURCE_DIR)
+#     EXCLUDE "src/dir1/*" "src/dir2/*"           # Patterns to exclude (can be relative
+#                                                 #  to BASE_DIRECTORY, with CMake 3.4+)
+#     NO_DEMANGLE                                 # Don't demangle C++ symbols
+#                                                 #  even if c++filt is found
+# )
+function(setup_target_for_coverage_lcov)
+
+    set(options NO_DEMANGLE)
+    set(oneValueArgs BASE_DIRECTORY NAME)
+    set(multiValueArgs EXCLUDE EXECUTABLE EXECUTABLE_ARGS DEPENDENCIES LCOV_ARGS GENHTML_ARGS)
+    cmake_parse_arguments(Coverage "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+    if(NOT LCOV_PATH)
+        message(FATAL_ERROR "lcov not found! Aborting...")
+    endif() # NOT LCOV_PATH
+
+    if(NOT GENHTML_PATH)
+        message(FATAL_ERROR "genhtml not found! Aborting...")
+    endif() # NOT GENHTML_PATH
+
+    # Set base directory (as absolute path), or default to PROJECT_SOURCE_DIR
+    if(DEFINED Coverage_BASE_DIRECTORY)
+        get_filename_component(BASEDIR ${Coverage_BASE_DIRECTORY} ABSOLUTE)
+    else()
+        set(BASEDIR ${PROJECT_SOURCE_DIR})
+    endif()
+
+    # Collect excludes (CMake 3.4+: Also compute absolute paths)
+    set(LCOV_EXCLUDES "")
+    foreach(EXCLUDE ${Coverage_EXCLUDE} ${COVERAGE_EXCLUDES} ${COVERAGE_LCOV_EXCLUDES})
+        if(CMAKE_VERSION VERSION_GREATER 3.4)
+            get_filename_component(EXCLUDE ${EXCLUDE} ABSOLUTE BASE_DIR ${BASEDIR})
+        endif()
+        list(APPEND LCOV_EXCLUDES "${EXCLUDE}")
+    endforeach()
+    list(REMOVE_DUPLICATES LCOV_EXCLUDES)
+
+    # Conditional arguments
+    if(CPPFILT_PATH AND NOT ${Coverage_NO_DEMANGLE})
+      set(GENHTML_EXTRA_ARGS "--demangle-cpp")
+    endif()
+     
+    # Setting up commands which will be run to generate coverage data.
+    # Cleanup lcov
+    set(LCOV_CLEAN_CMD 
+        ${LCOV_PATH} ${Coverage_LCOV_ARGS} --gcov-tool ${GCOV_PATH} -directory . 
+        -b ${BASEDIR} --zerocounters
+    )
+    # Create baseline to make sure untouched files show up in the report
+    set(LCOV_BASELINE_CMD 
+        ${LCOV_PATH} ${Coverage_LCOV_ARGS} --gcov-tool ${GCOV_PATH} -c -i -d . -b 
+        ${BASEDIR} -o ${Coverage_NAME}.base
+    )
+    # Run tests
+    set(LCOV_EXEC_TESTS_CMD 
+        ${Coverage_EXECUTABLE} ${Coverage_EXECUTABLE_ARGS}
+    )    
+    # Capturing lcov counters and generating report
+    set(LCOV_CAPTURE_CMD 
+        ${LCOV_PATH} ${Coverage_LCOV_ARGS} --gcov-tool ${GCOV_PATH} --directory . -b 
+        ${BASEDIR} --capture --output-file ${Coverage_NAME}.capture
+    )
+    # add baseline counters
+    set(LCOV_BASELINE_COUNT_CMD
+        ${LCOV_PATH} ${Coverage_LCOV_ARGS} --gcov-tool ${GCOV_PATH} -a ${Coverage_NAME}.base 
+        -a ${Coverage_NAME}.capture --output-file ${Coverage_NAME}.total
+    ) 
+    # filter collected data to final coverage report
+    set(LCOV_FILTER_CMD 
+        ${LCOV_PATH} ${Coverage_LCOV_ARGS} --gcov-tool ${GCOV_PATH} --remove 
+        ${Coverage_NAME}.total ${LCOV_EXCLUDES} --output-file ${Coverage_NAME}.info
+    )    
+    # Generate HTML output
+    set(LCOV_GEN_HTML_CMD
+        ${GENHTML_PATH} ${GENHTML_EXTRA_ARGS} ${Coverage_GENHTML_ARGS} -o 
+        ${Coverage_NAME} ${Coverage_NAME}.info
+    )
+    
+
+    if(CODE_COVERAGE_VERBOSE)
+        message(STATUS "Executed command report")
+        message(STATUS "Command to clean up lcov: ")
+        string(REPLACE ";" " " LCOV_CLEAN_CMD_SPACED "${LCOV_CLEAN_CMD}")
+        message(STATUS "${LCOV_CLEAN_CMD_SPACED}")
+
+        message(STATUS "Command to create baseline: ")
+        string(REPLACE ";" " " LCOV_BASELINE_CMD_SPACED "${LCOV_BASELINE_CMD}")
+        message(STATUS "${LCOV_BASELINE_CMD_SPACED}")
+
+        message(STATUS "Command to run the tests: ")
+        string(REPLACE ";" " " LCOV_EXEC_TESTS_CMD_SPACED "${LCOV_EXEC_TESTS_CMD}")
+        message(STATUS "${LCOV_EXEC_TESTS_CMD_SPACED}")
+
+        message(STATUS "Command to capture counters and generate report: ")
+        string(REPLACE ";" " " LCOV_CAPTURE_CMD_SPACED "${LCOV_CAPTURE_CMD}")
+        message(STATUS "${LCOV_CAPTURE_CMD_SPACED}")
+
+        message(STATUS "Command to add baseline counters: ")
+        string(REPLACE ";" " " LCOV_BASELINE_COUNT_CMD_SPACED "${LCOV_BASELINE_COUNT_CMD}")
+        message(STATUS "${LCOV_BASELINE_COUNT_CMD_SPACED}")
+
+        message(STATUS "Command to filter collected data: ")
+        string(REPLACE ";" " " LCOV_FILTER_CMD_SPACED "${LCOV_FILTER_CMD}")
+        message(STATUS "${LCOV_FILTER_CMD_SPACED}")
+
+        message(STATUS "Command to generate lcov HTML output: ")
+        string(REPLACE ";" " " LCOV_GEN_HTML_CMD_SPACED "${LCOV_GEN_HTML_CMD}")
+        message(STATUS "${LCOV_GEN_HTML_CMD_SPACED}")
+    endif()
+
+    # Setup target
+    add_custom_target(${Coverage_NAME}
+        COMMAND ${LCOV_CLEAN_CMD}
+        COMMAND ${LCOV_BASELINE_CMD} 
+        COMMAND ${LCOV_EXEC_TESTS_CMD}
+        COMMAND ${LCOV_CAPTURE_CMD}
+        COMMAND ${LCOV_BASELINE_COUNT_CMD}
+        COMMAND ${LCOV_FILTER_CMD} 
+        COMMAND ${LCOV_GEN_HTML_CMD}
+
+        # Set output files as GENERATED (will be removed on 'make clean')
+        BYPRODUCTS
+            ${Coverage_NAME}.base
+            ${Coverage_NAME}.capture
+            ${Coverage_NAME}.total
+            ${Coverage_NAME}.info
+            ${Coverage_NAME}/index.html
+        WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+        DEPENDS ${Coverage_DEPENDENCIES}
+        VERBATIM # Protect arguments to commands
+        COMMENT "Resetting code coverage counters to zero.\nProcessing code coverage counters and generating report."
+    )
+
+    # Show where to find the lcov info report
+    add_custom_command(TARGET ${Coverage_NAME} POST_BUILD
+        COMMAND ;
+        COMMENT "Lcov code coverage info report saved in ${Coverage_NAME}.info."
+    )
+
+    # Show info where to find the report
+    add_custom_command(TARGET ${Coverage_NAME} POST_BUILD
+        COMMAND ;
+        COMMENT "Open ./${Coverage_NAME}/index.html in your browser to view the coverage report."
+    )
+
+endfunction() # setup_target_for_coverage_lcov
+
+# Defines a target for running and collection code coverage information
+# Builds dependencies, runs the given executable and outputs reports.
+# NOTE! The executable should always have a ZERO as exit code otherwise
+# the coverage generation will not complete.
+#
+# setup_target_for_coverage_gcovr_xml(
+#     NAME ctest_coverage                    # New target name
+#     EXECUTABLE ctest -j ${PROCESSOR_COUNT} # Executable in PROJECT_BINARY_DIR
+#     DEPENDENCIES executable_target         # Dependencies to build first
+#     BASE_DIRECTORY "../"                   # Base directory for report
+#                                            #  (defaults to PROJECT_SOURCE_DIR)
+#     EXCLUDE "src/dir1/*" "src/dir2/*"      # Patterns to exclude (can be relative
+#                                            #  to BASE_DIRECTORY, with CMake 3.4+)
+# )
+# The user can set the variable GCOVR_ADDITIONAL_ARGS to supply additional flags to the
+# GCVOR command.
+function(setup_target_for_coverage_gcovr_xml)
+
+    set(options NONE)
+    set(oneValueArgs BASE_DIRECTORY NAME)
+    set(multiValueArgs EXCLUDE EXECUTABLE EXECUTABLE_ARGS DEPENDENCIES)
+    cmake_parse_arguments(Coverage "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+    if(NOT GCOVR_PATH)
+        message(FATAL_ERROR "gcovr not found! Aborting...")
+    endif() # NOT GCOVR_PATH
+
+    # Set base directory (as absolute path), or default to PROJECT_SOURCE_DIR
+    if(DEFINED Coverage_BASE_DIRECTORY)
+        get_filename_component(BASEDIR ${Coverage_BASE_DIRECTORY} ABSOLUTE)
+    else()
+        set(BASEDIR ${PROJECT_SOURCE_DIR})
+    endif()
+
+    # Collect excludes (CMake 3.4+: Also compute absolute paths)
+    set(GCOVR_EXCLUDES "")
+    foreach(EXCLUDE ${Coverage_EXCLUDE} ${COVERAGE_EXCLUDES} ${COVERAGE_GCOVR_EXCLUDES})
+        if(CMAKE_VERSION VERSION_GREATER 3.4)
+            get_filename_component(EXCLUDE ${EXCLUDE} ABSOLUTE BASE_DIR ${BASEDIR})
+        endif()
+        list(APPEND GCOVR_EXCLUDES "${EXCLUDE}")
+    endforeach()
+    list(REMOVE_DUPLICATES GCOVR_EXCLUDES)
+
+    # Combine excludes to several -e arguments
+    set(GCOVR_EXCLUDE_ARGS "")
+    foreach(EXCLUDE ${GCOVR_EXCLUDES})
+        list(APPEND GCOVR_EXCLUDE_ARGS "-e")
+        list(APPEND GCOVR_EXCLUDE_ARGS "${EXCLUDE}")
+    endforeach()
+    
+    # Set up commands which will be run to generate coverage data
+    # Run tests
+    set(GCOVR_XML_EXEC_TESTS_CMD
+        ${Coverage_EXECUTABLE} ${Coverage_EXECUTABLE_ARGS}
+    )
+    # Running gcovr
+    set(GCOVR_XML_CMD
+        ${GCOVR_PATH} --xml -r ${BASEDIR} ${GCOVR_ADDITIONAL_ARGS} ${GCOVR_EXCLUDE_ARGS} 
+        --object-directory=${PROJECT_BINARY_DIR} -o ${Coverage_NAME}.xml
+    )
+    
+    if(CODE_COVERAGE_VERBOSE)
+        message(STATUS "Executed command report")
+
+        message(STATUS "Command to run tests: ")
+        string(REPLACE ";" " " GCOVR_XML_EXEC_TESTS_CMD_SPACED "${GCOVR_XML_EXEC_TESTS_CMD}")
+        message(STATUS "${GCOVR_XML_EXEC_TESTS_CMD_SPACED}")
+
+        message(STATUS "Command to generate gcovr XML coverage data: ")
+        string(REPLACE ";" " " GCOVR_XML_CMD_SPACED "${GCOVR_XML_CMD}")
+        message(STATUS "${GCOVR_XML_CMD_SPACED}")
+    endif()
+
+    add_custom_target(${Coverage_NAME}
+        COMMAND ${GCOVR_XML_EXEC_TESTS_CMD}
+        COMMAND ${GCOVR_XML_CMD}
+        
+        BYPRODUCTS ${Coverage_NAME}.xml
+        WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+        DEPENDS ${Coverage_DEPENDENCIES}
+        VERBATIM # Protect arguments to commands
+        COMMENT "Running gcovr to produce Cobertura code coverage report."
+    )
+
+    # Show info where to find the report
+    add_custom_command(TARGET ${Coverage_NAME} POST_BUILD
+        COMMAND ;
+        COMMENT "Cobertura code coverage report saved in ${Coverage_NAME}.xml."
+    )
+endfunction() # setup_target_for_coverage_gcovr_xml
+
+# Defines a target for running and collection code coverage information
+# Builds dependencies, runs the given executable and outputs reports.
+# NOTE! The executable should always have a ZERO as exit code otherwise
+# the coverage generation will not complete.
+#
+# setup_target_for_coverage_gcovr_html(
+#     NAME ctest_coverage                    # New target name
+#     EXECUTABLE ctest -j ${PROCESSOR_COUNT} # Executable in PROJECT_BINARY_DIR
+#     DEPENDENCIES executable_target         # Dependencies to build first
+#     BASE_DIRECTORY "../"                   # Base directory for report
+#                                            #  (defaults to PROJECT_SOURCE_DIR)
+#     EXCLUDE "src/dir1/*" "src/dir2/*"      # Patterns to exclude (can be relative
+#                                            #  to BASE_DIRECTORY, with CMake 3.4+)
+# )
+# The user can set the variable GCOVR_ADDITIONAL_ARGS to supply additional flags to the
+# GCVOR command.
+function(setup_target_for_coverage_gcovr_html)
+
+    set(options NONE)
+    set(oneValueArgs BASE_DIRECTORY NAME)
+    set(multiValueArgs EXCLUDE EXECUTABLE EXECUTABLE_ARGS DEPENDENCIES)
+    cmake_parse_arguments(Coverage "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+    if(NOT GCOVR_PATH)
+        message(FATAL_ERROR "gcovr not found! Aborting...")
+    endif() # NOT GCOVR_PATH
+
+    # Set base directory (as absolute path), or default to PROJECT_SOURCE_DIR
+    if(DEFINED Coverage_BASE_DIRECTORY)
+        get_filename_component(BASEDIR ${Coverage_BASE_DIRECTORY} ABSOLUTE)
+    else()
+        set(BASEDIR ${PROJECT_SOURCE_DIR})
+    endif()
+
+    # Collect excludes (CMake 3.4+: Also compute absolute paths)
+    set(GCOVR_EXCLUDES "")
+    foreach(EXCLUDE ${Coverage_EXCLUDE} ${COVERAGE_EXCLUDES} ${COVERAGE_GCOVR_EXCLUDES})
+        if(CMAKE_VERSION VERSION_GREATER 3.4)
+            get_filename_component(EXCLUDE ${EXCLUDE} ABSOLUTE BASE_DIR ${BASEDIR})
+        endif()
+        list(APPEND GCOVR_EXCLUDES "${EXCLUDE}")
+    endforeach()
+    list(REMOVE_DUPLICATES GCOVR_EXCLUDES)
+
+    # Combine excludes to several -e arguments
+    set(GCOVR_EXCLUDE_ARGS "")
+    foreach(EXCLUDE ${GCOVR_EXCLUDES})
+        list(APPEND GCOVR_EXCLUDE_ARGS "-e")
+        list(APPEND GCOVR_EXCLUDE_ARGS "${EXCLUDE}")
+    endforeach()
+
+    # Set up commands which will be run to generate coverage data
+    # Run tests
+    set(GCOVR_HTML_EXEC_TESTS_CMD
+        ${Coverage_EXECUTABLE} ${Coverage_EXECUTABLE_ARGS}
+    )
+    # Create folder
+    set(GCOVR_HTML_FOLDER_CMD
+        ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/${Coverage_NAME}
+    )
+    # Running gcovr
+    set(GCOVR_HTML_CMD
+        ${GCOVR_PATH} --html --html-details -r ${BASEDIR} ${GCOVR_ADDITIONAL_ARGS}
+        ${GCOVR_EXCLUDE_ARGS} --object-directory=${PROJECT_BINARY_DIR} 
+        -o ${Coverage_NAME}/index.html
+    )
+
+    if(CODE_COVERAGE_VERBOSE)
+        message(STATUS "Executed command report")
+
+        message(STATUS "Command to run tests: ")
+        string(REPLACE ";" " " GCOVR_HTML_EXEC_TESTS_CMD_SPACED "${GCOVR_HTML_EXEC_TESTS_CMD}")
+        message(STATUS "${GCOVR_HTML_EXEC_TESTS_CMD_SPACED}")
+
+        message(STATUS "Command to create a folder: ")
+        string(REPLACE ";" " " GCOVR_HTML_FOLDER_CMD_SPACED "${GCOVR_HTML_FOLDER_CMD}")
+        message(STATUS "${GCOVR_HTML_FOLDER_CMD_SPACED}")
+
+        message(STATUS "Command to generate gcovr HTML coverage data: ")
+        string(REPLACE ";" " " GCOVR_HTML_CMD_SPACED "${GCOVR_HTML_CMD}")
+        message(STATUS "${GCOVR_HTML_CMD_SPACED}")
+    endif()
+
+    add_custom_target(${Coverage_NAME}
+        COMMAND ${GCOVR_HTML_EXEC_TESTS_CMD}
+        COMMAND ${GCOVR_HTML_FOLDER_CMD}
+        COMMAND ${GCOVR_HTML_CMD}
+
+        BYPRODUCTS ${PROJECT_BINARY_DIR}/${Coverage_NAME}/index.html  # report directory
+        WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+        DEPENDS ${Coverage_DEPENDENCIES}
+        VERBATIM # Protect arguments to commands
+        COMMENT "Running gcovr to produce HTML code coverage report."
+    )
+
+    # Show info where to find the report
+    add_custom_command(TARGET ${Coverage_NAME} POST_BUILD
+        COMMAND ;
+        COMMENT "Open ./${Coverage_NAME}/index.html in your browser to view the coverage report."
+    )
+
+endfunction() # setup_target_for_coverage_gcovr_html
+
+# Defines a target for running and collection code coverage information
+# Builds dependencies, runs the given executable and outputs reports.
+# NOTE! The executable should always have a ZERO as exit code otherwise
+# the coverage generation will not complete.
+#
+# setup_target_for_coverage_fastcov(
+#     NAME testrunner_coverage                    # New target name
+#     EXECUTABLE testrunner -j ${PROCESSOR_COUNT} # Executable in PROJECT_BINARY_DIR
+#     DEPENDENCIES testrunner                     # Dependencies to build first
+#     BASE_DIRECTORY "../"                        # Base directory for report
+#                                                 #  (defaults to PROJECT_SOURCE_DIR)
+#     EXCLUDE "src/dir1/" "src/dir2/"             # Patterns to exclude.
+#     NO_DEMANGLE                                 # Don't demangle C++ symbols
+#                                                 #  even if c++filt is found
+#     SKIP_HTML                                   # Don't create html report
+#     POST_CMD perl -i -pe s!${PROJECT_SOURCE_DIR}/!!g ctest_coverage.json  # E.g. for stripping source dir from file paths
+# )
+function(setup_target_for_coverage_fastcov)
+
+    set(options NO_DEMANGLE SKIP_HTML)
+    set(oneValueArgs BASE_DIRECTORY NAME)
+    set(multiValueArgs EXCLUDE EXECUTABLE EXECUTABLE_ARGS DEPENDENCIES FASTCOV_ARGS GENHTML_ARGS POST_CMD)
+    cmake_parse_arguments(Coverage "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+    if(NOT FASTCOV_PATH)
+        message(FATAL_ERROR "fastcov not found! Aborting...")
+    endif()
+
+    if(NOT Coverage_SKIP_HTML AND NOT GENHTML_PATH)
+        message(FATAL_ERROR "genhtml not found! Aborting...")
+    endif()
+
+    # Set base directory (as absolute path), or default to PROJECT_SOURCE_DIR
+    if(Coverage_BASE_DIRECTORY)
+        get_filename_component(BASEDIR ${Coverage_BASE_DIRECTORY} ABSOLUTE)
+    else()
+        set(BASEDIR ${PROJECT_SOURCE_DIR})
+    endif()
+
+    # Collect excludes (Patterns, not paths, for fastcov)
+    set(FASTCOV_EXCLUDES "")
+    foreach(EXCLUDE ${Coverage_EXCLUDE} ${COVERAGE_EXCLUDES} ${COVERAGE_FASTCOV_EXCLUDES})
+        list(APPEND FASTCOV_EXCLUDES "${EXCLUDE}")
+    endforeach()
+    list(REMOVE_DUPLICATES FASTCOV_EXCLUDES)
+
+    # Conditional arguments
+    if(CPPFILT_PATH AND NOT ${Coverage_NO_DEMANGLE})
+        set(GENHTML_EXTRA_ARGS "--demangle-cpp")
+    endif()
+
+    # Set up commands which will be run to generate coverage data
+    set(FASTCOV_EXEC_TESTS_CMD ${Coverage_EXECUTABLE} ${Coverage_EXECUTABLE_ARGS})
+
+    set(FASTCOV_CAPTURE_CMD ${FASTCOV_PATH} ${Coverage_FASTCOV_ARGS} --gcov ${GCOV_PATH}
+        --search-directory ${BASEDIR}
+        --process-gcno
+        --output ${Coverage_NAME}.json
+        --exclude ${FASTCOV_EXCLUDES}
+        --exclude ${FASTCOV_EXCLUDES}
+    )
+    
+    set(FASTCOV_CONVERT_CMD ${FASTCOV_PATH}
+        -C ${Coverage_NAME}.json --lcov --output ${Coverage_NAME}.info
+    )
+
+    if(Coverage_SKIP_HTML)
+        set(FASTCOV_HTML_CMD ";")
+    else()
+        set(FASTCOV_HTML_CMD ${GENHTML_PATH} ${GENHTML_EXTRA_ARGS} ${Coverage_GENHTML_ARGS}
+            -o ${Coverage_NAME} ${Coverage_NAME}.info
+        )
+    endif()
+
+    set(FASTCOV_POST_CMD ";")
+    if(Coverage_POST_CMD)
+        set(FASTCOV_POST_CMD ${Coverage_POST_CMD})
+    endif()
+
+    if(CODE_COVERAGE_VERBOSE)
+        message(STATUS "Code coverage commands for target ${Coverage_NAME} (fastcov):")
+
+        message("   Running tests:")
+        string(REPLACE ";" " " FASTCOV_EXEC_TESTS_CMD_SPACED "${FASTCOV_EXEC_TESTS_CMD}")
+        message("     ${FASTCOV_EXEC_TESTS_CMD_SPACED}")
+
+        message("   Capturing fastcov counters and generating report:")
+        string(REPLACE ";" " " FASTCOV_CAPTURE_CMD_SPACED "${FASTCOV_CAPTURE_CMD}")
+        message("     ${FASTCOV_CAPTURE_CMD_SPACED}")
+
+        message("   Converting fastcov .json to lcov .info:")
+        string(REPLACE ";" " " FASTCOV_CONVERT_CMD_SPACED "${FASTCOV_CONVERT_CMD}")
+        message("     ${FASTCOV_CONVERT_CMD_SPACED}")
+
+        if(NOT Coverage_SKIP_HTML)
+            message("   Generating HTML report: ")
+            string(REPLACE ";" " " FASTCOV_HTML_CMD_SPACED "${FASTCOV_HTML_CMD}")
+            message("     ${FASTCOV_HTML_CMD_SPACED}")
+        endif()
+        if(Coverage_POST_CMD)
+            message("   Running post command: ")
+            string(REPLACE ";" " " FASTCOV_POST_CMD_SPACED "${FASTCOV_POST_CMD}")
+            message("     ${FASTCOV_POST_CMD_SPACED}")
+        endif()
+    endif()
+
+    # Setup target
+    add_custom_target(${Coverage_NAME}
+
+        # Cleanup fastcov
+        COMMAND ${FASTCOV_PATH} ${Coverage_FASTCOV_ARGS} --gcov ${GCOV_PATH}
+            --search-directory ${BASEDIR}
+            --zerocounters
+
+        COMMAND ${FASTCOV_EXEC_TESTS_CMD}
+        COMMAND ${FASTCOV_CAPTURE_CMD}
+        COMMAND ${FASTCOV_CONVERT_CMD}
+        COMMAND ${FASTCOV_HTML_CMD}
+        COMMAND ${FASTCOV_POST_CMD}
+
+        # Set output files as GENERATED (will be removed on 'make clean')
+        BYPRODUCTS
+             ${Coverage_NAME}.info
+             ${Coverage_NAME}.json
+             ${Coverage_NAME}/index.html  # report directory
+
+        WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+        DEPENDS ${Coverage_DEPENDENCIES}
+        VERBATIM # Protect arguments to commands
+        COMMENT "Resetting code coverage counters to zero. Processing code coverage counters and generating report."
+    )
+
+    set(INFO_MSG "fastcov code coverage info report saved in ${Coverage_NAME}.info and ${Coverage_NAME}.json.")
+    if(NOT Coverage_SKIP_HTML)
+        string(APPEND INFO_MSG " Open ${PROJECT_BINARY_DIR}/${Coverage_NAME}/index.html in your browser to view the coverage report.")
+    endif()
+    # Show where to find the fastcov info report
+    add_custom_command(TARGET ${Coverage_NAME} POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E echo ${INFO_MSG}
+    )
+
+endfunction() # setup_target_for_coverage_fastcov
+
+function(append_coverage_compiler_flags)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COVERAGE_COMPILER_FLAGS}" PARENT_SCOPE)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COVERAGE_COMPILER_FLAGS}" PARENT_SCOPE)
+    set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${COVERAGE_COMPILER_FLAGS}" PARENT_SCOPE)
+    message(STATUS "Appending code coverage compiler flags: ${COVERAGE_COMPILER_FLAGS}")
+endfunction() # append_coverage_compiler_flags

deps/cpp-statsd-client/cmake/Config.cmake.in

@@ -0,0 +1,18 @@
+# Copyright (c) 2016, Ruslan Baratov
+#
+# Licensed under the MIT License (the "License"); you may not use this file except
+# in compliance with the License. You may obtain a copy of the License at
+#
+# http://opensource.org/licenses/MIT
+#
+# Unless required by applicable law or agreed to in writing, software distributed
+# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
+
+@PACKAGE_INIT@
+
+find_package(Threads REQUIRED)
+
+include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake")
+check_required_components("@PROJECT_NAME@")

deps/cpp-statsd-client/cmake/cpp-statsd-clientConfig.cmake.in

@@ -0,0 +1,4 @@
+@PACKAGE_INIT@
+
+include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
+check_required_components("@PROJECT_NAME@")

deps/cpp-statsd-client/images/logo.svg

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="515px" height="315px" viewBox="0 0 515 315" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 47.1 (45422) - http://www.bohemiancoding.com/sketch -->
+    <title>Artboard Copy</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
+        <g id="Artboard-Copy" stroke-width="3">
+            <g id="Group" transform="translate(55.000000, 70.000000)">
+                <polyline id="Path-4" stroke="#F3A530" points="7.5 118.5 48.5 44.5 191.5 170 355 87"></polyline>
+                <polyline id="Path-5" stroke="#30499B" points="0.5 62 113 160.5 355 0"></polyline>
+                <polyline id="Path-6" stroke="#4CB2D4" points="42 146.5 194 39 406 175.5"></polyline>
+            </g>
+        </g>
+    </g>
+</svg>

deps/cpp-statsd-client/include/cpp-statsd-client/StatsdClient.hpp

@@ -0,0 +1,318 @@
+#ifndef STATSD_CLIENT_HPP
+#define STATSD_CLIENT_HPP
+
+#include <cpp-statsd-client/UDPSender.hpp>
+#include <cstdint>
+#include <cstdio>
+#include <iomanip>
+#include <memory>
+#include <random>
+#include <sstream>
+#include <string>
+#include <vector>
+
+namespace Statsd {
+
+/*!
+ *
+ * Statsd client
+ *
+ * This is the Statsd client, exposing the classic methods
+ * and relying on a UDP sender for the actual sending.
+ *
+ * The prefix for a stat is provided once at construction or
+ * on reconfiguring the client. The separator character '.'
+ * is automatically inserted between the prefix and the stats
+ * key, therefore you should neither append one to the prefix
+ * nor prepend one to the key
+ *
+ * The sampling frequency is specified per call and uses a
+ * random number generator to determine whether or not the stat
+ * will be recorded this time or not.
+ *
+ * The top level configuration includes 2 optional parameters
+ * that determine how the stats are delivered to statsd. These
+ * parameters are the batching size and the send interval.
+ *
+ * The batching size controls the number of bytes to send
+ * in each UDP datagram to statsd. This is not a hard limit as
+ * we continue appending to a batch of stats until the limit
+ * has been reached or surpassed. When this occurs we add the
+ * batch to a queue and create a new batch to appended to. A
+ * value of 0 for the batching size will disable batching such
+ * that each stat will be sent to the daemon individually.
+ *
+ * The send interval controls the rate at which queued batches
+ * of stats will be sent to statsd. If batching is disabled,
+ * this value is ignored and each individual stat is sent to
+ * statsd immediately in a blocking fashion. If batching is
+ * enabled (ie. non-zero) then the send interval is the number
+ * of milliseconds to wait before flushing the queue of
+ * batched stats messages to the daemon. This is done in a non-
+ * blocking fashion via a background thread. If the send
+ * interval is 0 then the stats messages are appended to a
+ * queue until the caller manually flushes the queue via the
+ * flush method.
+ *
+ */
+class StatsdClient {
+public:
+    //!@name Constructor and destructor, non-copyable
+    //!@{
+
+    //! Constructor
+    StatsdClient(const std::string& host,
+                 const uint16_t port,
+                 const std::string& prefix,
+                 const uint64_t batchsize = 0,
+                 const uint64_t sendInterval = 1000,
+                 const unsigned int gaugePrecision = 4) noexcept;
+
+    StatsdClient(const StatsdClient&) = delete;
+    StatsdClient& operator=(const StatsdClient&) = delete;
+
+    //!@}
+
+    //!@name Methods
+    //!@{
+
+    //! Sets a configuration { host, port, prefix, batchsize }
+    void setConfig(const std::string& host,
+                   const uint16_t port,
+                   const std::string& prefix,
+                   const uint64_t batchsize = 0,
+                   const uint64_t sendInterval = 1000,
+                   const unsigned int gaugePrecision = 4) noexcept;
+
+    //! Returns the error message as an std::string
+    const std::string& errorMessage() const noexcept;
+
+    //! Increments the key, at a given frequency rate
+    void increment(const std::string& key,
+                   float frequency = 1.0f,
+                   const std::vector<std::string>& tags = {}) const noexcept;
+
+    //! Increments the key, at a given frequency rate
+    void decrement(const std::string& key,
+                   float frequency = 1.0f,
+                   const std::vector<std::string>& tags = {}) const noexcept;
+
+    //! Adjusts the specified key by a given delta, at a given frequency rate
+    void count(const std::string& key,
+               const int delta,
+               float frequency = 1.0f,
+               const std::vector<std::string>& tags = {}) const noexcept;
+
+    //! Records a gauge for the key, with a given value, at a given frequency rate
+    template <typename T>
+    void gauge(const std::string& key,
+               const T value,
+               float frequency = 1.0f,
+               const std::vector<std::string>& tags = {}) const noexcept;
+
+    //! Records a timing for a key, at a given frequency
+    void timing(const std::string& key,
+                const unsigned int ms,
+                float frequency = 1.0f,
+                const std::vector<std::string>& tags = {}) const noexcept;
+
+    //! Records a count of unique occurrences for a key, at a given frequency
+    void set(const std::string& key,
+             const unsigned int sum,
+             float frequency = 1.0f,
+             const std::vector<std::string>& tags = {}) const noexcept;
+
+    //! Seed the RNG that controls sampling
+    void seed(unsigned int seed = std::random_device()()) noexcept;
+
+    //! Flush any queued stats to the daemon
+    void flush() noexcept;
+
+    //!@}
+
+private:
+    // @name Private methods
+    // @{
+
+    //! Send a value for a key, according to its type, at a given frequency
+    template <typename T>
+    void send(const std::string& key,
+              const T value,
+              const char* type,
+              float frequency,
+              const std::vector<std::string>& tags) const noexcept;
+
+    //!@}
+
+private:
+    //! The prefix to be used for metrics
+    std::string m_prefix;
+
+    //! The UDP sender to be used for actual sending
+    std::unique_ptr<UDPSender> m_sender;
+
+    //! The random number generator for handling sampling
+    mutable std::mt19937 m_randomEngine;
+
+    //! The buffer string format our stats before sending them
+    mutable std::string m_buffer;
+
+    //! Fixed floating point precision of gauges
+    unsigned int m_gaugePrecision;
+};
+
+namespace detail {
+inline std::string sanitizePrefix(std::string prefix) {
+    // For convenience we provide the dot when generating the stat message
+    if (!prefix.empty() && prefix.back() == '.') {
+        prefix.pop_back();
+    }
+    return prefix;
+}
+
+// All supported metric types
+constexpr char METRIC_TYPE_COUNT[] = "c";
+constexpr char METRIC_TYPE_GAUGE[] = "g";
+constexpr char METRIC_TYPE_TIMING[] = "ms";
+constexpr char METRIC_TYPE_SET[] = "s";
+}  // namespace detail
+
+inline StatsdClient::StatsdClient(const std::string& host,
+                                  const uint16_t port,
+                                  const std::string& prefix,
+                                  const uint64_t batchsize,
+                                  const uint64_t sendInterval,
+                                  const unsigned int gaugePrecision) noexcept
+    : m_prefix(detail::sanitizePrefix(prefix)),
+      m_sender(new UDPSender{host, port, batchsize, sendInterval}),
+      m_gaugePrecision(gaugePrecision) {
+    // Initialize the random generator to be used for sampling
+    seed();
+    // Avoid re-allocations by reserving a generous buffer
+    m_buffer.reserve(256);
+}
+
+inline void StatsdClient::setConfig(const std::string& host,
+                                    const uint16_t port,
+                                    const std::string& prefix,
+                                    const uint64_t batchsize,
+                                    const uint64_t sendInterval,
+                                    const unsigned int gaugePrecision) noexcept {
+    m_prefix = detail::sanitizePrefix(prefix);
+    m_sender.reset(new UDPSender(host, port, batchsize, sendInterval));
+    m_gaugePrecision = gaugePrecision;
+}
+
+inline const std::string& StatsdClient::errorMessage() const noexcept {
+    return m_sender->errorMessage();
+}
+
+inline void StatsdClient::decrement(const std::string& key,
+                                    float frequency,
+                                    const std::vector<std::string>& tags) const noexcept {
+    count(key, -1, frequency, tags);
+}
+
+inline void StatsdClient::increment(const std::string& key,
+                                    float frequency,
+                                    const std::vector<std::string>& tags) const noexcept {
+    count(key, 1, frequency, tags);
+}
+
+inline void StatsdClient::count(const std::string& key,
+                                const int delta,
+                                float frequency,
+                                const std::vector<std::string>& tags) const noexcept {
+    send(key, delta, detail::METRIC_TYPE_COUNT, frequency, tags);
+}
+
+template <typename T>
+inline void StatsdClient::gauge(const std::string& key,
+                                const T value,
+                                const float frequency,
+                                const std::vector<std::string>& tags) const noexcept {
+    send(key, value, detail::METRIC_TYPE_GAUGE, frequency, tags);
+}
+
+inline void StatsdClient::timing(const std::string& key,
+                                 const unsigned int ms,
+                                 float frequency,
+                                 const std::vector<std::string>& tags) const noexcept {
+    send(key, ms, detail::METRIC_TYPE_TIMING, frequency, tags);
+}
+
+inline void StatsdClient::set(const std::string& key,
+                              const unsigned int sum,
+                              float frequency,
+                              const std::vector<std::string>& tags) const noexcept {
+    send(key, sum, detail::METRIC_TYPE_SET, frequency, tags);
+}
+
+template <typename T>
+inline void StatsdClient::send(const std::string& key,
+                               const T value,
+                               const char* type,
+                               float frequency,
+                               const std::vector<std::string>& tags) const noexcept {
+    // Bail if we can't send anything anyway
+    if (!m_sender->initialized()) {
+        return;
+    }
+
+    // A valid frequency is: 0 <= f <= 1
+    // At 0 you never emit the stat, at 1 you always emit the stat and with anything else you roll the dice
+    frequency = std::max(std::min(frequency, 1.f), 0.f);
+    constexpr float epsilon{0.0001f};
+    const bool isFrequencyOne = std::fabs(frequency - 1.0f) < epsilon;
+    const bool isFrequencyZero = std::fabs(frequency) < epsilon;
+    if (isFrequencyZero ||
+        (!isFrequencyOne && (frequency < std::uniform_real_distribution<float>(0.f, 1.f)(m_randomEngine)))) {
+        return;
+    }
+
+    // Format the stat message
+    std::stringstream valueStream;
+    valueStream << std::fixed << std::setprecision(m_gaugePrecision) << value;
+
+    m_buffer.clear();
+
+    m_buffer.append(m_prefix);
+    if (!m_prefix.empty() && !key.empty()) {
+        m_buffer.push_back('.');
+    }
+
+    m_buffer.append(key);
+    m_buffer.push_back(':');
+    m_buffer.append(valueStream.str());
+    m_buffer.push_back('|');
+    m_buffer.append(type);
+
+    if (frequency < 1.f) {
+        m_buffer.append("|@0.");
+        m_buffer.append(std::to_string(static_cast<int>(frequency * 100)));
+    }
+
+    if (!tags.empty()) {
+        m_buffer.append("|#");
+        for (const auto& tag : tags) {
+            m_buffer.append(tag);
+            m_buffer.push_back(',');
+        }
+        m_buffer.pop_back();
+    }
+
+    // Send the message via the UDP sender
+    m_sender->send(m_buffer);
+}
+
+inline void StatsdClient::seed(unsigned int seed) noexcept {
+    m_randomEngine.seed(seed);
+}
+
+inline void StatsdClient::flush() noexcept {
+    m_sender->flush();
+}
+
+}  // namespace Statsd
+
+#endif

deps/cpp-statsd-client/include/cpp-statsd-client/UDPSender.hpp

@@ -0,0 +1,345 @@
+#ifndef UDP_SENDER_HPP
+#define UDP_SENDER_HPP
+
+#ifdef _WIN32
+#define NOMINMAX
+#include <io.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#else
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <sys/socket.h>
+#include <unistd.h>
+#endif
+
+#include <atomic>
+#include <cmath>
+#include <cstdint>
+#include <cstring>
+#include <deque>
+#include <mutex>
+#include <string>
+#include <thread>
+
+namespace Statsd {
+
+#ifdef _WIN32
+using SOCKET_TYPE = SOCKET;
+constexpr SOCKET_TYPE k_invalidSocket{INVALID_SOCKET};
+#define SOCKET_ERRNO WSAGetLastError()
+#define SOCKET_CLOSE closesocket
+#else
+using SOCKET_TYPE = int;
+constexpr SOCKET_TYPE k_invalidSocket{-1};
+#define SOCKET_ERRNO errno
+#define SOCKET_CLOSE close
+#endif
+
+/*!
+ *
+ * UDP sender
+ *
+ * A simple UDP sender handling batching.
+ *
+ */
+class UDPSender final {
+public:
+    //!@name Constructor and destructor, non-copyable
+    //!@{
+
+    //! Constructor
+    UDPSender(const std::string& host,
+              const uint16_t port,
+              const uint64_t batchsize,
+              const uint64_t sendInterval) noexcept;
+
+    //! Destructor
+    ~UDPSender();
+
+    UDPSender(const UDPSender&) = delete;
+    UDPSender& operator=(const UDPSender&) = delete;
+    UDPSender(UDPSender&&) = delete;
+
+    //!@}
+
+    //!@name Methods
+    //!@{
+
+    //! Send or enqueue a message
+    void send(const std::string& message) noexcept;
+
+    //! Returns the error message as a string
+    const std::string& errorMessage() const noexcept;
+
+    //! Returns true if the sender is initialized
+    bool initialized() const noexcept;
+
+    //! Flushes any queued messages
+    void flush() noexcept;
+
+    //!@}
+
+private:
+    // @name Private methods
+    // @{
+
+    //! Initialize the sender and returns true when it is initialized
+    bool initialize() noexcept;
+
+    //! Queue a message to be sent to the daemon later
+    inline void queueMessage(const std::string& message) noexcept;
+
+    //! Send a message to the daemon
+    void sendToDaemon(const std::string& message) noexcept;
+
+    //!@}
+
+private:
+    // @name State variables
+    // @{
+
+    //! Shall we exit?
+    std::atomic<bool> m_mustExit{false};
+
+    //!@}
+
+    // @name Network info
+    // @{
+
+    //! The hostname
+    std::string m_host;
+
+    //! The port
+    uint16_t m_port;
+
+    //! The structure holding the server
+    struct sockaddr_in m_server;
+
+    //! The socket to be used
+    SOCKET_TYPE m_socket = k_invalidSocket;
+
+    //!@}
+
+    // @name Batching info
+    // @{
+
+    //! The batching size
+    uint64_t m_batchsize;
+
+    //! The sending frequency in milliseconds
+    uint64_t m_sendInterval;
+
+    //! The queue batching the messages
+    std::deque<std::string> m_batchingMessageQueue;
+
+    //! The mutex used for batching
+    std::mutex m_batchingMutex;
+
+    //! The thread dedicated to the batching
+    std::thread m_batchingThread;
+
+    //!@}
+
+    //! Error message (optional string)
+    std::string m_errorMessage;
+};
+
+namespace detail {
+
+inline bool isValidSocket(const SOCKET_TYPE socket) {
+    return socket != k_invalidSocket;
+}
+
+#ifdef _WIN32
+struct WinSockSingleton {
+    inline static const WinSockSingleton& getInstance() {
+        static const WinSockSingleton instance;
+        return instance;
+    }
+    inline bool ok() const {
+        return m_ok;
+    }
+    ~WinSockSingleton() {
+        WSACleanup();
+    }
+
+private:
+    WinSockSingleton() {
+        WSADATA wsa;
+        m_ok = WSAStartup(MAKEWORD(2, 2), &wsa) == 0;
+    }
+    bool m_ok;
+};
+#endif
+
+}  // namespace detail
+
+inline UDPSender::UDPSender(const std::string& host,
+                            const uint16_t port,
+                            const uint64_t batchsize,
+                            const uint64_t sendInterval) noexcept
+    : m_host(host), m_port(port), m_batchsize(batchsize), m_sendInterval(sendInterval) {
+    // Initialize the socket
+    if (!initialize()) {
+        return;
+    }
+
+    // If batching is on, use a dedicated thread to send after the wait time is reached
+    if (m_batchsize != 0 && m_sendInterval > 0) {
+        // Define the batching thread
+        m_batchingThread = std::thread([this] {
+            // TODO: this will drop unsent stats, should we send all the unsent stats before we exit?
+            while (!m_mustExit.load(std::memory_order_acquire)) {
+                std::deque<std::string> stagedMessageQueue;
+
+                std::unique_lock<std::mutex> batchingLock(m_batchingMutex);
+                m_batchingMessageQueue.swap(stagedMessageQueue);
+                batchingLock.unlock();
+
+                // Flush the queue
+                while (!stagedMessageQueue.empty()) {
+                    sendToDaemon(stagedMessageQueue.front());
+                    stagedMessageQueue.pop_front();
+                }
+
+                // Wait before sending the next batch
+                std::this_thread::sleep_for(std::chrono::milliseconds(m_sendInterval));
+            }
+        });
+    }
+}
+
+inline UDPSender::~UDPSender() {
+    if (!initialized()) {
+        return;
+    }
+
+    // If we're running a background thread tell it to stop
+    if (m_batchingThread.joinable()) {
+        m_mustExit.store(true, std::memory_order_release);
+        m_batchingThread.join();
+    }
+
+    // Cleanup the socket
+    SOCKET_CLOSE(m_socket);
+}
+
+inline void UDPSender::send(const std::string& message) noexcept {
+    m_errorMessage.clear();
+
+    // If batching is on, accumulate messages in the queue
+    if (m_batchsize > 0) {
+        queueMessage(message);
+        return;
+    }
+
+    // Or send it right now
+    sendToDaemon(message);
+}
+
+inline void UDPSender::queueMessage(const std::string& message) noexcept {
+    // We aquire a lock but only if we actually need to (i.e. there is a thread also accessing the queue)
+    auto batchingLock =
+        m_batchingThread.joinable() ? std::unique_lock<std::mutex>(m_batchingMutex) : std::unique_lock<std::mutex>();
+    // Either we don't have a place to batch our message or we exceeded the batch size, so make a new batch
+    if (m_batchingMessageQueue.empty() || m_batchingMessageQueue.back().length() > m_batchsize) {
+        m_batchingMessageQueue.emplace_back();
+        m_batchingMessageQueue.back().reserve(m_batchsize + 256);
+    }  // When there is already a batch open we need a separator when its not empty
+    else if (!m_batchingMessageQueue.back().empty()) {
+        m_batchingMessageQueue.back().push_back('\n');
+    }
+    // Add the new message to the batch
+    m_batchingMessageQueue.back().append(message);
+}
+
+inline const std::string& UDPSender::errorMessage() const noexcept {
+    return m_errorMessage;
+}
+
+inline bool UDPSender::initialize() noexcept {
+#ifdef _WIN32
+    if (!detail::WinSockSingleton::getInstance().ok()) {
+        m_errorMessage = "WSAStartup failed: errno=" + std::to_string(SOCKET_ERRNO);
+    }
+#endif
+
+    // Connect the socket
+    m_socket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+    if (!detail::isValidSocket(m_socket)) {
+        m_errorMessage = "socket creation failed: errno=" + std::to_string(SOCKET_ERRNO);
+        return false;
+    }
+
+    std::memset(&m_server, 0, sizeof(m_server));
+    m_server.sin_family = AF_INET;
+    m_server.sin_port = htons(m_port);
+
+    if (inet_pton(AF_INET, m_host.c_str(), &m_server.sin_addr) == 0) {
+        // An error code has been returned by inet_aton
+
+        // Specify the criteria for selecting the socket address structure
+        struct addrinfo hints;
+        std::memset(&hints, 0, sizeof(hints));
+        hints.ai_family = AF_INET;
+        hints.ai_socktype = SOCK_DGRAM;
+
+        // Get the address info using the hints
+        struct addrinfo* results = nullptr;
+        const int ret{getaddrinfo(m_host.c_str(), nullptr, &hints, &results)};
+        if (ret != 0) {
+            // An error code has been returned by getaddrinfo
+            SOCKET_CLOSE(m_socket);
+            m_socket = k_invalidSocket;
+            m_errorMessage = "getaddrinfo failed: err=" + std::to_string(ret) + ", msg=" + gai_strerror(ret);
+            return false;
+        }
+
+        // Copy the results in m_server
+        struct sockaddr_in* host_addr = (struct sockaddr_in*)results->ai_addr;
+        std::memcpy(&m_server.sin_addr, &host_addr->sin_addr, sizeof(struct in_addr));
+
+        // Free the memory allocated
+        freeaddrinfo(results);
+    }
+
+    return true;
+}
+
+inline void UDPSender::sendToDaemon(const std::string& message) noexcept {
+    // Try sending the message
+    const auto ret = sendto(m_socket,
+                            message.data(),
+#ifdef _WIN32
+                            static_cast<int>(message.size()),
+#else
+                            message.size(),
+#endif
+                            0,
+                            (struct sockaddr*)&m_server,
+                            sizeof(m_server));
+    if (ret == -1) {
+        m_errorMessage = "sendto server failed: host=" + m_host + ":" + std::to_string(m_port) +
+                         ", err=" + std::to_string(SOCKET_ERRNO);
+    }
+}
+
+inline bool UDPSender::initialized() const noexcept {
+    return m_socket != k_invalidSocket;
+}
+
+inline void UDPSender::flush() noexcept {
+    // We aquire a lock but only if we actually need to (ie there is a thread also accessing the queue)
+    auto batchingLock =
+        m_batchingThread.joinable() ? std::unique_lock<std::mutex>(m_batchingMutex) : std::unique_lock<std::mutex>();
+    // Flush the queue
+    while (!m_batchingMessageQueue.empty()) {
+        sendToDaemon(m_batchingMessageQueue.front());
+        m_batchingMessageQueue.pop_front();
+    }
+}
+
+}  // namespace Statsd
+
+#endif

deps/cpp-statsd-client/tests/StatsdServer.hpp

@@ -0,0 +1,80 @@
+#ifndef STATSD_SERVER_HPP
+#define STATSD_SERVER_HPP
+
+// It might make sense to include this test class in the UDPSender header
+// it includes most of the cross platform defines etc that we need for socket io
+#include "cpp-statsd-client/UDPSender.hpp"
+
+#include <algorithm>
+#include <string>
+
+namespace Statsd {
+
+class StatsdServer {
+public:
+    StatsdServer(unsigned short port = 8125) noexcept {
+#ifdef _WIN32
+        if (!detail::WinSockSingleton::getInstance().ok()) {
+            m_errorMessage = "WSAStartup failed: errno=" + std::to_string(SOCKET_ERRNO);
+        }
+#endif
+
+        // Create the socket
+        m_socket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+        if (!detail::isValidSocket(m_socket)) {
+            m_errorMessage = "socket creation failed: errno=" + std::to_string(SOCKET_ERRNO);
+            return;
+        }
+
+        // Binding should be with ipv4 to all interfaces
+        struct sockaddr_in address {};
+        address.sin_family = AF_INET;
+        address.sin_port = htons(port);
+        address.sin_addr.s_addr = INADDR_ANY;
+
+        // Try to bind
+        if (bind(m_socket, reinterpret_cast<const struct sockaddr*>(&address), sizeof(address)) != 0) {
+            SOCKET_CLOSE(m_socket);
+            m_socket = k_invalidSocket;
+            m_errorMessage = "bind failed: errno=" + std::to_string(SOCKET_ERRNO);
+        }
+    }
+
+    ~StatsdServer() {
+        if (detail::isValidSocket(m_socket)) {
+            SOCKET_CLOSE(m_socket);
+        }
+    }
+
+    const std::string& errorMessage() const noexcept {
+        return m_errorMessage;
+    }
+
+    std::string receive() noexcept {
+        // If uninitialized then bail
+        if (!detail::isValidSocket(m_socket)) {
+            return "";
+        }
+
+        // Try to receive (this is blocking)
+        std::string buffer(256, '\0');
+        int string_len;
+        if ((string_len = recv(m_socket, &buffer[0], static_cast<int>(buffer.size()), 0)) < 1) {
+            m_errorMessage = "Could not recv on the socket file descriptor";
+            return "";
+        }
+
+        // No error return the trimmed result
+        m_errorMessage.clear();
+        buffer.resize(std::min(static_cast<size_t>(string_len), buffer.size()));
+        return buffer;
+    }
+
+private:
+    SOCKET_TYPE m_socket;
+    std::string m_errorMessage;
+};
+
+}  // namespace Statsd
+
+#endif

deps/cpp-statsd-client/tests/testStatsdClient.cpp

@@ -0,0 +1,184 @@
+#include <iostream>
+
+#include "StatsdServer.hpp"
+#include "cpp-statsd-client/StatsdClient.hpp"
+
+using namespace Statsd;
+
+// Each test suite below spawns a thread to recv the client messages over UDP as if it were a real statsd server
+// Note that we could just synchronously recv metrics and not use a thread but doing the test async has the
+// advantage that we can test the threaded batching mode in a straightforward way. The server thread basically
+// just keeps storing metrics in an vector until it hears a special one signaling the test is over and bails
+void mock(StatsdServer& server, std::vector<std::string>& messages) {
+    do {
+        // Grab the messages that are waiting
+        auto recvd = server.receive();
+
+        // Split the messages on '\n'
+        auto start = std::string::npos;
+        do {
+            // Keep this message
+            auto end = recvd.find('\n', ++start);
+            messages.emplace_back(recvd.substr(start, end));
+            start = end;
+
+            // Bail if we found the special quit message
+            if (messages.back().find("DONE") != std::string::npos) {
+                messages.pop_back();
+                return;
+            }
+        } while (start != std::string::npos);
+    } while (server.errorMessage().empty() && !messages.back().empty());
+}
+
+template <typename SocketWrapper>
+void throwOnError(const SocketWrapper& wrapped, bool expectEmpty = true, const std::string& extraMessage = "") {
+    if (wrapped.errorMessage().empty() != expectEmpty) {
+        std::cerr << (expectEmpty ? wrapped.errorMessage() : extraMessage) << std::endl;
+        throw std::runtime_error(expectEmpty ? wrapped.errorMessage() : extraMessage);
+    }
+}
+
+void throwOnWrongMessage(StatsdServer& server, const std::string& expected) {
+    auto actual = server.receive();
+    if (actual != expected) {
+        std::cerr << "Expected: " << expected << " but got: " << actual << std::endl;
+        throw std::runtime_error("Incorrect stat received");
+    }
+}
+
+void testErrorConditions() {
+    // Resolve a rubbish ip and make sure initialization failed
+    StatsdClient client{"256.256.256.256", 8125, "myPrefix", 20};
+    throwOnError(client, false, "Should not be able to resolve a ridiculous ip");
+}
+
+void testReconfigure() {
+    StatsdServer server;
+    throwOnError(server);
+
+    StatsdClient client("localhost", 8125, "first.");
+    client.increment("foo");
+    throwOnWrongMessage(server, "first.foo:1|c");
+
+    client.setConfig("localhost", 8125, "second");
+    client.increment("bar");
+    throwOnWrongMessage(server, "second.bar:1|c");
+
+    client.setConfig("localhost", 8125, "");
+    client.increment("third.baz");
+    throwOnWrongMessage(server, "third.baz:1|c");
+
+    client.increment("");
+    throwOnWrongMessage(server, ":1|c");
+
+    // TODO: test what happens with the batching after resolving the question about incomplete
+    //  batches being dropped vs sent on reconfiguring
+}
+
+void testSendRecv(uint64_t batchSize, uint64_t sendInterval) {
+    StatsdServer mock_server;
+    std::vector<std::string> messages, expected;
+    std::thread server(mock, std::ref(mock_server), std::ref(messages));
+
+    // Set a new config that has the client send messages to a proper address that can be resolved
+    StatsdClient client("localhost", 8125, "sendRecv.", batchSize, sendInterval, 3);
+    throwOnError(client);
+
+    // TODO: I forget if we need to wait for the server to be ready here before sending the first stats
+    //  is there a race condition where the client sending before the server binds would drop that clients message
+
+    for (int i = 0; i < 3; ++i) {
+        // Increment "coco"
+        client.increment("coco");
+        throwOnError(client);
+        expected.emplace_back("sendRecv.coco:1|c");
+
+        // Decrement "kiki"
+        client.decrement("kiki");
+        throwOnError(client);
+        expected.emplace_back("sendRecv.kiki:-1|c");
+
+        // Adjusts "toto" by +2
+        client.seed(19);  // this seed gets a hit on the first call
+        client.count("toto", 2, 0.1f);
+        throwOnError(client);
+        expected.emplace_back("sendRecv.toto:2|c|@0.10");
+
+        // Gets "sampled out" by the random number generator
+        client.count("popo", 9, 0.1f);
+        throwOnError(client);
+
+        // Record a gauge "titi" to 3
+        client.gauge("titi", 3);
+        throwOnError(client);
+        expected.emplace_back("sendRecv.titi:3|g");
+
+        // Record a gauge "titifloat" to -123.456789 with precision 3
+        client.gauge("titifloat", -123.456789);
+        throwOnError(client);
+        expected.emplace_back("sendRecv.titifloat:-123.457|g");
+
+        // Record a timing of 2ms for "myTiming"
+        client.seed(19);
+        client.timing("myTiming", 2, 0.1f);
+        throwOnError(client);
+        expected.emplace_back("sendRecv.myTiming:2|ms|@0.10");
+
+        // Send a set with 1227 total uniques
+        client.set("tutu", 1227, 2.0f);
+        throwOnError(client);
+        expected.emplace_back("sendRecv.tutu:1227|s");
+
+        // Gauge but with tags
+        client.gauge("dr.röstigrabe", 333, 1.f, {"liegt", "im", "weste"});
+        throwOnError(client);
+        expected.emplace_back("sendRecv.dr.röstigrabe:333|g|#liegt,im,weste");
+
+        // All the things
+        client.count("foo", -42, .9f, {"bar", "baz"});
+        throwOnError(client);
+        expected.emplace_back("sendRecv.foo:-42|c|@0.90|#bar,baz");
+    }
+
+    // Signal the mock server we are done
+    client.timing("DONE", 0);
+
+    // If manual flushing do it now
+    if (sendInterval == 0) {
+        client.flush();
+    }
+
+    // Wait for the server to stop
+    server.join();
+
+    // Make sure we get the exactly correct output
+    if (messages != expected) {
+        std::cerr << "Unexpected stats received by server, got:" << std::endl;
+        for (const auto& message : messages) {
+            std::cerr << message << std::endl;
+        }
+        std::cerr << std::endl << "But we expected:" << std::endl;
+        for (const auto& message : expected) {
+            std::cerr << message << std::endl;
+        }
+        throw std::runtime_error("Unexpected stats");
+    }
+}
+
+int main() {
+    // If any of these tests fail they throw an exception, not catching makes for a nonzero return code
+
+    // general things that should be errors
+    testErrorConditions();
+    // reconfiguring how you are sending
+    testReconfigure();
+    // no batching
+    testSendRecv(0, 0);
+    // background batching
+    testSendRecv(32, 1000);
+    // manual flushing of batches
+    testSendRecv(16, 0);
+
+    return EXIT_SUCCESS;
+}

keydb.conf

@@ -1145,6 +1145,11 @@ acllog-max-len 128
 #
 # active-expire-effort 1
 
+# Force evictions when used system memory reaches X% of total system memory.
+# This is useful as a safeguard to prevent OOM kills (0 to disable).
+#
+# force-eviction-percent 0
+
 ############################# LAZY FREEING ####################################
 
 # KeyDB has two primitives to delete keys. One is called DEL and is a blocking
@@ -2088,3 +2093,16 @@ active-client-balancing yes
 # disk space or any other I/O error KeyDB will instead use memory.
 #
 # blob-support false
+
+# Begin load shedding if we use more than X% CPU relative to the number of server threads
+# E.g. if overload-protect-percent is set to 80 and there are 8 server-threads, then the 
+# actual CPU protection will be 8 * 100 * 0.80 = 640% CPU usage.
+#
+# Set to 0 to disable
+# overload-protect-percent 0
+
+# Inform KeyDB of the availability zone if running in a cloud environment.  Currently
+# this is only exposed via the info command for clients to use, but in the future we
+# we may also use this when making decisions for replication.
+#
+# availability-zone "us-east-1a"

machamp_scripts/Dockerfile

@@ -0,0 +1,114 @@
+FROM ubuntu:20.04
+SHELL ["/bin/bash","-c"]
+RUN groupadd -r keydb && useradd -r -g keydb keydb
+# use gosu for easy step-down from root: https://github.com/tianon/gosu/releases
+ENV GOSU_VERSION 1.14
+RUN set -eux; \
+        savedAptMark="$(apt-mark showmanual)"; \
+        apt-get update; \
+        apt-get -o Dpkg::Options::="--force-confnew" install -y --no-install-recommends ca-certificates dirmngr gnupg wget; \
+        rm -rf /var/lib/apt/lists/*; \
+        dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \
+        wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
+        wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
+        export GNUPGHOME="$(mktemp -d)"; \
+        gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
+        gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
+        gpgconf --kill all; \
+        rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \
+        apt-mark auto '.*' > /dev/null; \
+        [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
+        apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+        chmod +x /usr/local/bin/gosu; \
+        gosu --version; \
+        gosu nobody true
+# build KeyDB
+ARG MAKE_JOBS=""
+ARG ENABLE_FLASH=""
+COPY . /tmp/keydb-internal
+RUN set -eux; \
+        cd /tmp/keydb-internal; \
+        savedAptMark="$(apt-mark showmanual)"; \
+        apt-get update; \
+        DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confnew" install -qqy --no-install-recommends \
+                dpkg-dev \
+                pkg-config \
+                ca-certificates \
+                build-essential \
+                nasm \
+                autotools-dev \
+                autoconf \
+                libjemalloc-dev \
+                tcl \
+                tcl-dev \
+                uuid-dev \
+                libcurl4-openssl-dev \
+                libbz2-dev \
+                libzstd-dev \
+                liblz4-dev \
+                libsnappy-dev \
+                libssl-dev \
+                git; \
+        # disable protected mode as it relates to docker
+        grep -E '^ *createBoolConfig[(]"protected-mode",.*, *1 *,.*[)],$' ./src/config.cpp; \
+        sed -ri 's!^( *createBoolConfig[(]"protected-mode",.*, *)1( *,.*[)],)$!\10\2!' ./src/config.cpp; \
+        grep -E '^ *createBoolConfig[(]"protected-mode",.*, *0 *,.*[)],$' ./src/config.cpp; \
+        make distclean; \
+        make -j$([ -z "$MAKE_JOBS" ] &&  nproc || echo "$MAKE_JOBS") BUILD_TLS=yes NO_LICENSE_CHECK=yes $([ -z "$ENABLE_FLASH" ] &&  echo "" || echo "ENABLE_FLASH=$ENABLE_FLASH"); \
+        cd src; \
+        mv modules/keydb_modstatsd/modstatsd.so /usr/local/lib/; \
+        strip keydb-cli keydb-benchmark keydb-check-rdb keydb-check-aof keydb-diagnostic-tool keydb-sentinel; \
+        mv keydb-server keydb-cli keydb-benchmark keydb-check-rdb keydb-check-aof keydb-diagnostic-tool keydb-sentinel /usr/local/bin/; \
+        # clean up unused dependencies
+        echo $savedAptMark; \
+        apt-mark auto '.*' > /dev/null; \
+        [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
+        find /usr/local -type f -executable -exec ldd '{}' ';' \
+               | awk '/=>/ { print $(NF-1) }' \
+               | sed 's:.*/::' \
+               | sort -u \
+               | xargs -r dpkg-query --search \
+               | cut -d: -f1 \
+               | sort -u \
+               | xargs -r apt-mark manual \
+        ; \
+        apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+        rm -rf /var/lib/apt/lists/*; \
+# create working directories and organize files
+RUN \
+        mkdir /data && chown keydb:keydb /data; \
+        mkdir /flash && chown keydb:keydb /flash; \
+        mkdir -p /etc/keydb; \
+        cp /tmp/keydb-internal/keydb.conf /etc/keydb/; \
+        sed -i 's/^\(daemonize .*\)$/# \1/' /etc/keydb/keydb.conf; \
+        sed -i 's/^\(dir .*\)$/# \1\ndir \/data/' /etc/keydb/keydb.conf; \
+        sed -i 's/^\(logfile .*\)$/# \1/' /etc/keydb/keydb.conf; \
+        sed -i 's/protected-mode yes/protected-mode no/g' /etc/keydb/keydb.conf; \
+        sed -i 's/^\(bind .*\)$/# \1/' /etc/keydb/keydb.conf; \
+        echo -e "\nloadmodule /usr/local/lib/modstatsd.so" >> /etc/keydb/keydb.conf; \
+	ln -s keydb-cli redis-cli; \
+        cd /etc/keydb; \
+        ln -s keydb.conf redis.conf; \
+        rm -rf /tmp/*
+# generate entrypoint script
+RUN set -eux; \
+        echo '#!/bin/sh' > /usr/local/bin/docker-entrypoint.sh; \
+        echo 'set -e' >> /usr/local/bin/docker-entrypoint.sh; \
+        echo "# perpend 'keydb-server' if not provided as first argument" >> /usr/local/bin/docker-entrypoint.sh; \
+        echo 'if [ "${1}" != "keydb-server" ]; then' >> /usr/local/bin/docker-entrypoint.sh; \
+        echo '        set -- keydb-server "$@"' >> /usr/local/bin/docker-entrypoint.sh; \
+        echo 'fi' >> /usr/local/bin/docker-entrypoint.sh; \
+        echo "# allow the container to be started with `--user`" >> /usr/local/bin/docker-entrypoint.sh; \
+        echo 'if [ "$1" = "keydb-server" -a "$(id -u)" = "0" ]; then' >> /usr/local/bin/docker-entrypoint.sh; \
+        echo "        find . \! -user keydb -exec chown keydb '{}' +" >> /usr/local/bin/docker-entrypoint.sh; \
+        echo '        exec gosu keydb "$0" "$@"' >> /usr/local/bin/docker-entrypoint.sh; \
+        echo 'fi' >> /usr/local/bin/docker-entrypoint.sh; \
+        echo 'exec "$@"' >> /usr/local/bin/docker-entrypoint.sh; \
+        chmod +x /usr/local/bin/docker-entrypoint.sh
+# set remaining image properties
+VOLUME /data
+WORKDIR /data
+ENV KEYDB_PRO_DIRECTORY=/usr/local/bin/
+ENTRYPOINT ["docker-entrypoint.sh"]
+EXPOSE 6379
+CMD ["keydb-server","/etc/keydb/keydb.conf"]

machamp_scripts/build.sh

@@ -2,7 +2,7 @@
 
 # make the build
 git submodule init && git submodule update
-make BUILD_TLS=yes -j$(nproc) KEYDB_CFLAGS='-Werror' KEYDB_CXXFLAGS='-Werror'
+make BUILD_TLS=yes ENABLE_FLASH=yes -j$(nproc) KEYDB_CFLAGS='-Werror' KEYDB_CXXFLAGS='-Werror'
 
 # gen-cert
 ./utils/gen-test-certs.sh

pkg/deb/master_changelog

@@ -1,3 +1,86 @@
+keydb (6:6.3.4-1distribution_placeholder) codename_placeholder; urgency=medium
+
+  * Add keydb_modstatsd, a module for providing keydb stats to a local statsd server. Can be found under src/modules/keydb_modstatsd
+  * Fixed FreeBSD compile(Thanks to @bra-fsn)
+  * Fixed a bug in s3 bucket config that blocked startup(Thanks to Alexandre Chichmanian)
+  * Fixed a bug causing crash if keys command is called after a blocking command (Fixes issues #659, #605, #532)
+  * Added proper error checking of replica configs, now KeyDB will throw an error if replica-of config is passed before active-replica or multimaster configs
+  * Fixed double free bug in lazy free
+  * Added "overload-protect-percent" config, when enabled this will load shed clients whenever CPU usage exceeds configured value
+  * Added "availability-zone" config, this can be passed any string which will then be reported by info command
+  * Updated eviction logic to account for total system memory availability using sysinfo
+  * Fixed a bug where repl-backlog-size config was modified in keydb.conf with the runtime value during config rewrite
+  * Fixed a possible deadlock when running CLIENT KILL with large number of clients
+  * Fixed a bug where KeyDB would overcommit memory during fork BG save
+  * Fixed a bug with disk repl_backlog causing double free
+  * Fixed integer overflow issue in the temp rdb file naming (Thanks to @karthyuom)
+  * Fixed compile issue with GCC 13.1.1 (Thanks to @michieldwitte)
+  * Removed expireset and restored redis expire behaviour
+  * Fixed a bug causing forked processes to hang, specifically affecting RDB and AOF(Fixes issues #675, #619)
+  * Added "CLUSTER REPLICATE NO ONE" to turn a replica into an empty primary
+  * Added RDB-less full sync, can be enabled with config 'enable-keydb-fastsync'
+  * Added "flash-disable-key-cache" config to disable key cache which stores every key(but not value) in memory
+  * Moved cluster slot to key map to being stored by storage provider, rather than in memory
+  * Moved expires to be stored by storage provider, rather than in memory
+  * Enabled expiry/eviction from storage provider, previously only data stored in memory could be expired/evicted(Fixes #645 along with the 2 previous updates)
+  * Fixed a bug where swapdb result was not recovered after keydb restarts in FLASH mode (Thanks to @karthyuom)
+  * Fixed double free bug when fast sync was canceled early
+  * Fixed a bug where a temp rdb file with zero bytes is generated in flash mode (Thanks to @karthyuom)
+  * Fixed a bug where flash CF options are being reset to default after flushall (Thanks to @karthyuom)(Fixes issue #717)
+  * Updated debug reload command to work with flash
+  * Added support for KEYDB_PASSWORD env variable(Thanks to @einar-pexip)
+  * Compile with flash in Dockerfile(Thanks to @der-eismann)
+  * Fix broken redis-cli symlink (Thanks to @pimvandenbroek)
+  * Use tini for alpine docker(Thanks to @rofafor)
+
+-- Malavan Sotheeswaran <msotheeswaran@snapchat.com>  Sun, 29 Oct 2023 8:39:21 +0000
+
+keydb (6:6.3.3-1distribution_placeholder) codename_placeholder; urgency=medium
+
+  * To help accelerate our development efforts for KeyDB, this will be the last release containing support for Centos 7, Ubuntu 16.04, Ubuntu 18.04, Debian 9 and 32-bit builds
+  * This release contains fixes for 11 issues along with improvements to the KeyDB FLASH feature:
+  * Fixed race condition with expireset access (Issue #597)
+  * Fixed keys command with lua, and added keydb as an alternative to redis as lua variable to access db (Issue #562 and #594)
+  * Fixed hang in aof child (Issue #554)
+  * Fixed leaking fds from RDB save (Issue #453 and #584)
+  * Added config for S3 RDB load/save (Issue #584)
+  * Enabled active defrag during forkless background save to improve average memory efficiency (Issue #460)
+  * Fixed crash with fork background save during replication (Issue #567)
+  * RocksDB has been updated to v7.9.2
+  * Fixed missing slot_to_key map in FLASH cluster mode (Issue #574)
+  * Added keyspace notifications for keys loaded from FLASH at startup
+  * Fixed race condition in prefetchKeysAsync with FLASH enabled (Issue #571)
+  * Fixed integer overflow in rand family of commands(Issue #631, #632, #633)
+  * Fixed bad value in hincrbyfloat(Issue #634)
+  * Fixed OOM hang in rand family of commands(Issue #635)
+  * Added config to limit count of return values in rand family of commands(Issue #636)
+
+-- Ben Schermel <ben@eqalpha.com>  Tue, 18 Apr 2023 10:00:37 +0000
+
+keydb (6:6.3.2-1distribution_placeholder) codename_placeholder; urgency=medium
+
+  * This release contains Beta level support for KeyDB FLASH, new ASYNC commands, latency improvements and a number of bug fixes. 
+  * KeyDB FLASH is included as a Beta feature. FLASH allows KeyDB to persist data to the storage medium it is written to, avoiding the need for AOF/RDB files. KeyDB uses rocksdb as the persistent storage provider and can be enabled with config "storage-provider flash /path/to/rocksdb/output". Read more at https://docs.keydb.dev/docs/flash/
+  * In addition to GET/MGET, ASYNC support has been added for the following commands: HGET, HMGET, HKEYS, HVALS, HGETALL, HSCAN and can be enable with config "enable-async-commands yes”
+  * Packaging support for Ubuntu 22.04 (Jammy) and Debian 12 (Bookworm) has been included with this release
+  * Added new soft shutdown feature, can be enabled with config "soft-shutdown yes".
+  * If soft shutdown is enabled, instead of shutting down right away, the server will wait until all clients have disconnected, and will reject all new connection attempts.
+  * Fixed memory leak with tls certificates when tls allowlist is enabled
+  * Fixed bug in rdb load with flash enabled to ensure all dbs are safe to load (previously only checked db[0])
+  * Fixed race conditions in rdb load and replication
+  * Fixed memory access of rdb file after it should have been deleted
+  * Fixed integer overflow bug in flash(Issue #486)
+  * Improve TLS latency by queueing new commands before executing instead of after
+  * Removed O(n) count of memory usage from info command(replaced by O(1) estimate)
+  * Improved latency of clearing large number of flash DBs(Thanks to Paul Chen for this fix)(Issue #516)
+  * replaced sprintf with snprintf to avoid potential security bugs
+  * Fixed bug where a failed move due to key already existing in move target would result in the key being removed from move source(Thanks to Paul Chen for this fix)(Issue #497)
+  * Fixed usage of deprecated OpenSSL api in OpenSSL v>3.0.1(Issue #392)
+  * Imported security fixes from Redis (CVE-2023-22458 CVE-2022-35977)
+  * Other fixed issues: #480 #477 #454 #452 #303 #425 #492 #541
+
+-- Ben Schermel <ben@eqalpha.com>  Fri, 20 Jan 2023 20:00:37 +0000
+
 keydb (6:6.3.1-1distribution_placeholder) codename_placeholder; urgency=medium
 
   * This point release contains fixes to bugs related to expires, active-rep, and rdb saving

pkg/docker/Dockerfile

@@ -53,7 +53,7 @@ RUN set -eux; \
         grep -E '^ *createBoolConfig[(]"protected-mode",.*, *1 *,.*[)],$' ./src/config.cpp; \
         sed -ri 's!^( *createBoolConfig[(]"protected-mode",.*, *)1( *,.*[)],)$!\10\2!' ./src/config.cpp; \
         grep -E '^ *createBoolConfig[(]"protected-mode",.*, *0 *,.*[)],$' ./src/config.cpp; \
-        make -j$(nproc) BUILD_TLS=yes; \
+        make -j$(nproc) BUILD_TLS=yes ENABLE_FLASH=yes; \
         cd src; \
         strip keydb-cli keydb-benchmark keydb-check-rdb keydb-check-aof keydb-diagnostic-tool keydb-sentinel keydb-server; \
         mv keydb-server keydb-cli keydb-benchmark keydb-check-rdb keydb-check-aof keydb-diagnostic-tool keydb-sentinel /usr/local/bin/; \
@@ -83,6 +83,7 @@ RUN \
         sed -i 's/^\(logfile .*\)$/# \1/' /etc/keydb/keydb.conf; \
         sed -i 's/protected-mode yes/protected-mode no/g' /etc/keydb/keydb.conf; \
         sed -i 's/^\(bind .*\)$/# \1/' /etc/keydb/keydb.conf; \
+        cd /usr/local/bin; \
         ln -s keydb-cli redis-cli; \
         cd /etc/keydb; \
         ln -s keydb.conf redis.conf; \
@@ -96,6 +97,10 @@ RUN set -eux; \
         echo 'if [ "${1#-}" != "$1" ] || [ "${1%.conf}" != "$1" ]; then' >> /usr/local/bin/docker-entrypoint.sh; \
         echo '        set -- keydb-server "$@"' >> /usr/local/bin/docker-entrypoint.sh; \
         echo 'fi' >> /usr/local/bin/docker-entrypoint.sh; \
+        echo '# if KEYDB_PASSWORD is set, add it to the arguments' >> /usr/local/bin/docker-entrypoint.sh; \
+        echo 'if [ -n "$KEYDB_PASSWORD" ]; then' >> /usr/local/bin/docker-entrypoint.sh; \
+        echo '        set -- "$@" --requirepass "${KEYDB_PASSWORD}"' >> /usr/local/bin/docker-entrypoint.sh; \
+        echo 'fi' >> /usr/local/bin/docker-entrypoint.sh; \
         echo "# allow the container to be started with `--user`" >> /usr/local/bin/docker-entrypoint.sh; \
         echo 'if [ "$1" = "keydb-server" -a "$(id -u)" = "0" ]; then' >> /usr/local/bin/docker-entrypoint.sh; \
         echo "        find . \! -user keydb -exec chown keydb '{}' +" >> /usr/local/bin/docker-entrypoint.sh; \

pkg/docker/Dockerfile_Alpine

@@ -1,11 +1,11 @@
-FROM alpine:3.12
+FROM alpine:3.18
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
 RUN addgroup -S -g 1000 keydb && adduser -S -G keydb -u 999 keydb
 RUN mkdir -p /etc/keydb
 ARG BRANCH
 RUN set -eux; \
         \
-        apk add --no-cache su-exec; \
+        apk add --no-cache su-exec tini; \
         apk add --no-cache --virtual .build-deps \
                 coreutils \
                 gcc \
@@ -32,7 +32,7 @@ RUN set -eux; \
         grep -E '^ *createBoolConfig[(]"protected-mode",.*, *1 *,.*[)],$' ./src/config.cpp; \
         sed -ri 's!^( *createBoolConfig[(]"protected-mode",.*, *)1( *,.*[)],)$!\10\2!' ./src/config.cpp; \
         grep -E '^ *createBoolConfig[(]"protected-mode",.*, *0 *,.*[)],$' ./src/config.cpp; \
-        make -j$(nproc) BUILD_TLS=yes; \
+        make -j$(nproc) BUILD_TLS=yes ENABLE_FLASH=yes; \
         cd src; \
         strip keydb-cli keydb-benchmark keydb-check-rdb keydb-check-aof keydb-diagnostic-tool keydb-sentinel keydb-server; \
         mv keydb-server keydb-cli keydb-benchmark keydb-check-rdb keydb-check-aof keydb-diagnostic-tool keydb-sentinel /usr/local/bin/; \
@@ -54,6 +54,7 @@ RUN set -eux; \
         sed -i 's/^\(logfile .*\)$/# \1/' /etc/keydb/keydb.conf; \
         sed -i 's/protected-mode yes/protected-mode no/g' /etc/keydb/keydb.conf; \
         sed -i 's/^\(bind .*\)$/# \1/' /etc/keydb/keydb.conf; \
+        cd /usr/local/bin; \
         ln -s keydb-cli redis-cli; \
         cd /etc/keydb; \
         ln -s keydb.conf redis.conf; \
@@ -67,6 +68,10 @@ RUN set -eux; \
         echo 'if [ "${1#-}" != "$1" ] || [ "${1%.conf}" != "$1" ]; then' >> /usr/local/bin/docker-entrypoint.sh; \
         echo '        set -- keydb-server "$@"' >> /usr/local/bin/docker-entrypoint.sh; \
         echo 'fi' >> /usr/local/bin/docker-entrypoint.sh; \
+        echo '# if KEYDB_PASSWORD is set, add it to the arguments' >> /usr/local/bin/docker-entrypoint.sh; \
+        echo 'if [ -n "$KEYDB_PASSWORD" ]; then' >> /usr/local/bin/docker-entrypoint.sh; \
+        echo '        set -- "$@" --requirepass "${KEYDB_PASSWORD}"' >> /usr/local/bin/docker-entrypoint.sh; \
+        echo 'fi' >> /usr/local/bin/docker-entrypoint.sh; \
         echo "# allow the container to be started with `--user`" >> /usr/local/bin/docker-entrypoint.sh; \
         echo 'if [ "$1" = "keydb-server" -a "$(id -u)" = "0" ]; then' >> /usr/local/bin/docker-entrypoint.sh; \
         echo "        find . \! -user keydb -exec chown keydb '{}' +" >> /usr/local/bin/docker-entrypoint.sh; \
@@ -76,6 +81,6 @@ RUN set -eux; \
         chmod +x /usr/local/bin/docker-entrypoint.sh
 VOLUME /data
 WORKDIR /data
-ENTRYPOINT ["docker-entrypoint.sh"]
+ENTRYPOINT ["tini", "--", "docker-entrypoint.sh"]
 EXPOSE 6379
 CMD ["keydb-server", "/etc/keydb/keydb.conf"]

src/IStorage.h

@@ -1,6 +1,7 @@
 #pragma once
 #include <functional>
 #include "sds.h"
+#include <string>
 
 #define METADATA_DB_IDENTIFIER "c299fde0-6d42-4ec4-b939-34f680ffe39f"
 
@@ -14,6 +15,7 @@ public:
     virtual class IStorage *createMetadataDb() = 0;
     virtual const char *name() const = 0;
     virtual size_t totalDiskspaceUsed() const = 0;
+    virtual sdsstring getInfo() const = 0;
     virtual bool FSlow() const = 0;
     virtual size_t filedsRequired() const { return 0; }
 };
@@ -42,6 +44,11 @@ public:
         endWriteBatch();
     }
 
+    virtual std::vector<std::string> getExpirationCandidates(unsigned int count) = 0;
+    virtual std::vector<std::string> getEvictionCandidates(unsigned int count) = 0;
+    virtual void setExpire(const char *key, size_t cchKey, long long expire) = 0;
+    virtual void removeExpire(const char *key, size_t cchKey, long long expire) = 0;
+
     virtual void beginWriteBatch() {} // NOP
     virtual void endWriteBatch() {} // NOP
 

src/Makefile

@@ -142,7 +142,7 @@ DEBUG=-g -ggdb
 FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(KEYDB_CFLAGS) $(REDIS_CFLAGS)
 FINAL_CXXFLAGS=$(CXX_STD) $(WARN) $(OPT) $(DEBUG) $(CXXFLAGS) $(KEYDB_CFLAGS) $(REDIS_CFLAGS)
 FINAL_LDFLAGS=$(LDFLAGS) $(KEYDB_LDFLAGS) $(DEBUG)
-FINAL_LIBS+=-lm -lz -lcrypto -lbz2 -lzstd -llz4 -lsnappy
+FINAL_LIBS+=-lm -lz -lcrypto
 
 ifneq ($(uname_S),Darwin)
     ifneq ($(uname_S),FreeBSD)
@@ -358,6 +358,7 @@ endif
 OS := $(shell cat /etc/os-release | grep ID= | head -n 1 | cut -d'=' -f2)
 ifeq ($(OS),alpine)
     FINAL_CXXFLAGS+=-DUNW_LOCAL_ONLY
+	FINAL_CXXFLAGS+=-DALPINE
     FINAL_LIBS += -lunwind
 endif
 
@@ -384,7 +385,7 @@ endif
 
 REDIS_SERVER_NAME=keydb-server$(PROG_SUFFIX)
 REDIS_SENTINEL_NAME=keydb-sentinel$(PROG_SUFFIX)
-REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o t_nhash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o acl.o storage.o rdb-s3.o fastlock.o new.o tracking.o cron.o connection.o tls.o sha256.o motd_server.o timeout.o setcpuaffinity.o AsyncWorkQueue.o snapshot.o storage/teststorageprovider.o keydbutils.o StorageCache.o monotonic.o cli_common.o mt19937-64.o $(ASM_OBJ) $(STORAGE_OBJ)
+REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o t_nhash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o acl.o storage.o rdb-s3.o fastlock.o new.o tracking.o cron.o connection.o tls.o sha256.o motd_server.o timeout.o setcpuaffinity.o AsyncWorkQueue.o snapshot.o storage/teststorageprovider.o keydbutils.o StorageCache.o monotonic.o cli_common.o mt19937-64.o meminfo.o $(ASM_OBJ) $(STORAGE_OBJ)
 KEYDB_SERVER_OBJ=SnapshotPayloadParseState.o
 REDIS_CLI_NAME=keydb-cli$(PROG_SUFFIX)
 REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o redis-cli-cpphelper.o zmalloc.o release.o anet.o ae.o crcspeed.o crc64.o siphash.o crc16.o storage-lite.o fastlock.o motd_client.o monotonic.o cli_common.o mt19937-64.o $(ASM_OBJ)

src/SnapshotPayloadParseState.cpp

@@ -136,14 +136,33 @@ void SnapshotPayloadParseState::flushQueuedKeys() {
     int idb = current_database;
     serverAssert(vecqueuedKeys.size() == vecqueuedVals.size());
     auto sizePrev = vecqueuedKeys.size();
-    ++insertsInFlight;
-    auto &insertsInFlightTmp = insertsInFlight; // C++ GRRRRRRRRRRRRRRRR, we don't want to capute "this" because that's dangerous
     if (current_database < cserver.dbnum) {
-        g_pserver->asyncworkqueue->AddWorkFunction([idb, vecqueuedKeys = std::move(this->vecqueuedKeys), vecqueuedKeysCb = std::move(this->vecqueuedKeysCb), vecqueuedVals = std::move(this->vecqueuedVals), vecqueuedValsCb = std::move(this->vecqueuedValsCb), &insertsInFlightTmp, pallocator = m_spallocator.release()]() mutable {
-            g_pserver->db[idb]->bulkDirectStorageInsert(vecqueuedKeys.data(), vecqueuedKeysCb.data(), vecqueuedVals.data(), vecqueuedValsCb.data(), vecqueuedKeys.size());
-            --insertsInFlightTmp;
-            delete pallocator;
-        });
+        if (g_pserver->m_pstorageFactory) {
+            (*insertsInFlight)++;
+            std::weak_ptr<std::atomic<int>> insertsInFlightTmp = insertsInFlight; // C++ GRRRRRRRRRRRRRRRR, we don't want to capute "this" because that's dangerous
+            g_pserver->asyncworkqueue->AddWorkFunction([idb, vecqueuedKeys = std::move(this->vecqueuedKeys), vecqueuedKeysCb = std::move(this->vecqueuedKeysCb), vecqueuedVals = std::move(this->vecqueuedVals), vecqueuedValsCb = std::move(this->vecqueuedValsCb), insertsInFlightTmp, pallocator = m_spallocator.release()]() mutable {
+                g_pserver->db[idb]->bulkDirectStorageInsert(vecqueuedKeys.data(), vecqueuedKeysCb.data(), vecqueuedVals.data(), vecqueuedValsCb.data(), vecqueuedKeys.size());
+                (*(insertsInFlightTmp.lock()))--;
+                delete pallocator;
+            });
+        } else {
+            for (size_t ival = 0; ival < vecqueuedKeys.size(); ++ival) {
+                size_t offset = 0;
+                auto spexpire = deserializeExpire(vecqueuedVals[ival], vecqueuedValsCb[ival], &offset);    
+                auto o = deserializeStoredObject(vecqueuedVals[ival] + offset, vecqueuedValsCb[ival] - offset);
+                sds sdsKey = sdsnewlen(vecqueuedKeys[ival], -static_cast<ssize_t>(vecqueuedKeysCb[ival]));
+                if (dbMerge(g_pserver->db[idb], sdsKey, o, false)) {
+                    if (spexpire != nullptr)
+                        g_pserver->db[idb]->setExpire(sdsKey, std::move(*spexpire));
+                } else {
+                    sdsfree(sdsKey);
+                }
+            }
+            vecqueuedKeys.clear();
+            vecqueuedKeysCb.clear();
+            vecqueuedVals.clear();
+            vecqueuedValsCb.clear();
+        }
     } else {
         // else drop the data
         vecqueuedKeys.clear();
@@ -172,7 +191,7 @@ SnapshotPayloadParseState::SnapshotPayloadParseState() {
 
     dictLongLongMetaData = dictCreate(&metadataLongLongDictType, nullptr);
     dictMetaData = dictCreate(&metadataDictType, nullptr);
-    insertsInFlight = 0;
+    insertsInFlight = std::make_shared<std::atomic<int>>();
     m_spallocator = std::make_unique<SlabAllocator>();
 }
 
@@ -214,7 +233,7 @@ void SnapshotPayloadParseState::trimState() {
     
     if (stackParse.empty()) {
         flushQueuedKeys();
-        while (insertsInFlight > 0) {
+        while (*insertsInFlight > 0) {
             // TODO: ProcessEventsWhileBlocked
             aeReleaseLock();
             aeAcquireLock();

src/SnapshotPayloadParseState.h

@@ -36,7 +36,7 @@ class SnapshotPayloadParseState {
     std::vector<size_t> vecqueuedValsCb;
     
     
-    std::atomic<int> insertsInFlight;
+    std::shared_ptr<std::atomic<int>> insertsInFlight;
     std::unique_ptr<SlabAllocator> m_spallocator;
     dict *dictLongLongMetaData = nullptr;
     dict *dictMetaData = nullptr;
@@ -62,5 +62,5 @@ public:
     void pushArray(long long size);
     void pushValue(const char *rgch, long long cch);
     void pushValue(long long value);
-    bool shouldThrottle() const { return insertsInFlight > (cserver.cthreads*4); }
+    bool shouldThrottle() const { return *insertsInFlight > (cserver.cthreads*4); }
 };

src/StorageCache.cpp

@@ -84,19 +84,31 @@ void StorageCache::cacheKey(const char *rgch, size_t cch)
 
 bool StorageCache::erase(sds key)
 {
+    unsigned long long when = 0;
+    m_spstorage->retrieve(key, sdslen(key), [&when](const char *, size_t, const void * data, size_t cbdata) {
+        auto e = deserializeExpire((const char *)data, cbdata, nullptr);
+        if (e != nullptr)
+            when = e->when();
+    });
     bool result = m_spstorage->erase(key, sdslen(key));
     std::unique_lock<fastlock> ul(m_lock);
-    if (result && m_pdict != nullptr)
+    if (result)
     {
-        uint64_t hash = dictSdsHash(key);
-        dictEntry *de = dictFind(m_pdict, reinterpret_cast<void*>(hash));
-        serverAssert(de != nullptr);
-        de->v.s64--;
-        serverAssert(de->v.s64 >= 0);
-        if (de->v.s64 == 0) {
-            dictDelete(m_pdict, reinterpret_cast<void*>(hash));
-        } else {
-            m_collisionCount--;
+        if (m_pdict != nullptr)
+        {
+            uint64_t hash = dictSdsHash(key);
+            dictEntry *de = dictFind(m_pdict, reinterpret_cast<void*>(hash));
+            serverAssert(de != nullptr);
+            de->v.s64--;
+            serverAssert(de->v.s64 >= 0);
+            if (de->v.s64 == 0) {
+                dictDelete(m_pdict, reinterpret_cast<void*>(hash));
+            } else {
+                m_collisionCount--;
+            }
+        }
+        if (when != 0) {
+            m_spstorage->removeExpire(key, sdslen(key), when);
         }
     }
     return result;
@@ -111,6 +123,9 @@ void StorageCache::insert(sds key, const void *data, size_t cbdata, bool fOverwr
     }
     ul.unlock();
     m_spstorage->insert(key, sdslen(key), (void*)data, cbdata, fOverwrite);
+    auto e = deserializeExpire((const char *)data, cbdata, nullptr);
+    if (e != nullptr)
+        m_spstorage->setExpire(key, sdslen(key), e->when());
 }
 
 long _dictKeyIndex(dict *d, const void *key, uint64_t hash, dictEntry **existing);
@@ -119,13 +134,18 @@ void StorageCache::bulkInsert(char **rgkeys, size_t *rgcbkeys, char **rgvals, si
     std::vector<dictEntry*> vechashes;
     if (m_pdict != nullptr) {
         vechashes.reserve(celem);
+    }
 
-        for (size_t ielem = 0; ielem < celem; ++ielem) {
+    for (size_t ielem = 0; ielem < celem; ++ielem) {
+        if (m_pdict != nullptr) {
             dictEntry *de = (dictEntry*)zmalloc(sizeof(dictEntry));
             de->key = (void*)dictGenHashFunction(rgkeys[ielem], (int)rgcbkeys[ielem]);
             de->v.u64 = 1;
             vechashes.push_back(de);
         }
+        auto e = deserializeExpire(rgvals[ielem], rgcbvals[ielem], nullptr);
+        if (e != nullptr)
+            m_spstorage->setExpire(rgkeys[ielem], rgcbkeys[ielem], e->when());
     }
 
     std::unique_lock<fastlock> ul(m_lock);

src/StorageCache.h

@@ -51,11 +51,18 @@ public:
     bool enumerate(IStorage::callback fn) const { return m_spstorage->enumerate(fn); }
     bool enumerate_hashslot(IStorage::callback fn, unsigned int hashslot) const { return m_spstorage->enumerate_hashslot(fn, hashslot); }
 
+    std::vector<std::string> getExpirationCandidates(unsigned int count) { return m_spstorage->getExpirationCandidates(count); }
+    std::vector<std::string> getEvictionCandidates(unsigned int count) { return m_spstorage->getEvictionCandidates(count); }
+    void setExpire(const char *key, size_t cchKey, long long expire) { m_spstorage->setExpire(key, cchKey, expire); }
+    void removeExpire(const char *key, size_t cchKey, long long expire) { m_spstorage->removeExpire(key, cchKey, expire); }
+
     void beginWriteBatch();
     void endWriteBatch() { m_spstorage->endWriteBatch(); }
     void batch_lock() { return m_spstorage->batch_lock(); }
     void batch_unlock() { return m_spstorage->batch_unlock(); }
 
+    void flush() { m_spstorage->flush(); }
+
     size_t count() const;
 
     const StorageCache *clone();

src/ae.cpp

@@ -113,6 +113,8 @@ enum class AE_ASYNC_OP
     PostCppFunction,
     DeleteFileEvent,
     CreateFileEvent,
+    PostAsynDBFunction,
+
 };
 
 struct aeCommand
@@ -125,6 +127,8 @@ struct aeCommand
         aePostFunctionProc *proc;
         aeFileProc *fproc;
         std::function<void()> *pfn;
+        aePostFunctionTokenProc* tproc;
+
     };
     void *clientData;
 };
@@ -175,6 +179,17 @@ void aeProcessCmd(aeEventLoop *eventLoop, int fd, void *, int )
             (*cmd.pfn)();
 
             delete cmd.pfn;
+            break;
+        }
+        case AE_ASYNC_OP::PostAsynDBFunction:
+        {   //added to support async api IStorage
+           if (cmd.fLock && !ulock.owns_lock()) {
+                g_forkLock.releaseRead();
+                ulock.lock();
+                g_forkLock.acquireRead();
+            }  
+            ((aePostFunctionTokenProc*)cmd.tproc)(eventLoop,(StorageToken*)cmd.clientData);
+            break; 
         }
             break;
         }
@@ -256,6 +271,20 @@ int aePostFunction(aeEventLoop *eventLoop, aePostFunctionProc *proc, void *arg)
     return AE_OK;
 }
 
+int aePostFunction(aeEventLoop *eventLoop, aePostFunctionTokenProc *proc, StorageToken *token)
+{
+  //added to support async api IStorage
+    aeCommand cmd = {};
+    cmd.op = AE_ASYNC_OP::PostAsynDBFunction; 
+    cmd.tproc = proc;
+    cmd.clientData = (void*)token; 
+    cmd.fLock = true;
+    auto size = write(eventLoop->fdCmdWrite, &cmd, sizeof(cmd));
+    if (size != sizeof(cmd))
+        return AE_ERR;
+    return AE_OK;
+}
+
 int aePostFunction(aeEventLoop *eventLoop, std::function<void()> fn, bool fLock, bool fForceQueue)
 {
     if (eventLoop == g_eventLoopThisThread && !fForceQueue)
@@ -861,7 +890,7 @@ void aeReleaseForkLock()
 
 void aeForkLockInChild()
 {
-    g_forkLock.setNotify(false);
+    g_forkLock.setMulti(false);
 }
 
 int aeThreadOwnsLock()

src/ae.h

@@ -72,13 +72,15 @@ extern "C" {
 #define AE_NOTUSED(V) ((void) V)
 
 struct aeEventLoop;
-
 /* Types and data structures */
 typedef void aeFileProc(struct aeEventLoop *eventLoop, int fd, void *clientData, int mask);
 typedef int aeTimeProc(struct aeEventLoop *eventLoop, long long id, void *clientData);
 typedef void aeEventFinalizerProc(struct aeEventLoop *eventLoop, void *clientData);
 typedef void aeBeforeSleepProc(struct aeEventLoop *eventLoop);
 typedef void aePostFunctionProc(void *pvArgs);
+//added to support async api IStorage
+struct StorageToken;
+typedef void aePostFunctionTokenProc(struct aeEventLoop *el, struct StorageToken *token);
 
 /* File event structure */
 typedef struct aeFileEvent {
@@ -134,6 +136,8 @@ int aePostFunction(aeEventLoop *eventLoop, aePostFunctionProc *proc, void *arg);
 #ifdef __cplusplus
 }   // EXTERN C
 int aePostFunction(aeEventLoop *eventLoop, std::function<void()> fn, bool fLock = true, bool fForceQueue = false);
+//added to support async api IStorage
+int aePostFunction(aeEventLoop *eventLoop, aePostFunctionTokenProc *proc, StorageToken *token);
 extern "C" {
 #endif
 void aeDeleteEventLoop(aeEventLoop *eventLoop);

src/aof.cpp

@@ -1592,8 +1592,7 @@ int rewriteAppendOnlyFileRio(rio *aof) {
             }
             /* Save the expire time */
             if (o->FExpires()) {
-                std::unique_lock<fastlock> ul(g_expireLock);
-                expireEntry *pexpire = db->getExpire(&key);
+                expireEntry *pexpire = &o->expire;
                 for (auto &subExpire : *pexpire) {
                     if (subExpire.subkey() == nullptr)
                     {

src/cluster.cpp

@@ -4516,8 +4516,8 @@ void clusterCommand(client *c) {
 "NODES",
 "    Return cluster configuration seen by node. Output format:",
 "    <id> <ip:port> <flags> <master> <pings> <pongs> <epoch> <link> <slot> ...",
-"REPLICATE <node-id>",
-"    Configure current node as replica to <node-id>.",
+"REPLICATE (<node-id>|NO ONE)",
+"    Configure current node as replica to <node-id> or turn it into empty primary.",
 "RESET [HARD|SOFT]",
 "    Reset current node (default: soft).",
 "SET-CONFIG-EPOCH <epoch>",
@@ -4890,14 +4890,22 @@ NULL
         clusterDoBeforeSleep(CLUSTER_TODO_UPDATE_STATE|
                              CLUSTER_TODO_SAVE_CONFIG);
         addReply(c,shared.ok);
-    } else if (!strcasecmp(szFromObj(c->argv[1]),"replicate") && c->argc == 3) {
-        /* CLUSTER REPLICATE <NODE ID> */
-        clusterNode *n = clusterLookupNode(szFromObj(c->argv[2]));
-
-        /* Lookup the specified node in our table. */
-        if (!n) {
-            addReplyErrorFormat(c,"Unknown node %s", (char*)ptrFromObj(c->argv[2]));
-            return;
+    } else if (!strcasecmp(szFromObj(c->argv[1]),"replicate") && (c->argc == 3 || c->argc == 4)) {
+        /* CLUSTER REPLICATE (<NODE ID>|NO ONE) */
+        clusterNode *n;
+        if (c->argc == 4) {
+            if (0 != strcasecmp(szFromObj(c->argv[2]),"NO") || 0 != strcasecmp(szFromObj(c->argv[3]),"ONE")) {
+                addReplySubcommandSyntaxError(c);
+                return;
+            }
+            n = nullptr;
+        } else {
+            /* Lookup the specified node in our table. */
+            n = clusterLookupNode(szFromObj(c->argv[2]));
+            if (n == nullptr) {
+                addReplyErrorFormat(c,"Unknown node %s", (char*)ptrFromObj(c->argv[2]));
+                return;
+            }
         }
 
         /* I can't replicate myself. */
@@ -4907,7 +4915,7 @@ NULL
         }
 
         /* Can't replicate a slave. */
-        if (nodeIsSlave(n)) {
+        if (n != nullptr && nodeIsSlave(n)) {
             addReplyError(c,"I can only replicate a master, not a replica.");
             return;
         }
@@ -4923,8 +4931,26 @@ NULL
             return;
         }
 
-        /* Set the master. */
-        clusterSetMaster(n);
+        if (n == nullptr) {
+            if (nodeIsMaster(myself)) {
+                addReply(c,shared.ok);
+                return;
+            }
+            serverLog(LL_NOTICE,"Stop replication and turning myself into empty primary.");
+            clusterSetNodeAsMaster(myself);
+            if (listLength(g_pserver->masters) > 0)
+            {
+                serverAssert(listLength(g_pserver->masters) == 1);
+                replicationUnsetMaster((redisMaster*)listFirst(g_pserver->masters)->value);
+            }
+            int empty_db_flags = g_pserver->repl_slave_lazy_flush ? EMPTYDB_ASYNC : EMPTYDB_NO_FLAGS;
+            emptyDb(-1,empty_db_flags, nullptr);
+            /* Reset manual failover state. */
+            resetManualFailover();
+        } else {
+            /* Set the master. */
+            clusterSetMaster(n);
+        }
         clusterDoBeforeSleep(CLUSTER_TODO_UPDATE_STATE|CLUSTER_TODO_SAVE_CONFIG);
         addReply(c,shared.ok);
     } else if ((!strcasecmp(szFromObj(c->argv[1]),"slaves") ||
@@ -5584,7 +5610,6 @@ try_again:
     /* Create RESTORE payload and generate the protocol to call the command. */
     for (j = 0; j < num_keys; j++) {
         long long ttl = 0;
-        std::unique_lock<fastlock> ul(g_expireLock);
         expireEntry *pexpire = c->db->getExpire(kv[j]);
         long long expireat = INVALID_EXPIRE;
         if (pexpire != nullptr)
@@ -5966,7 +5991,9 @@ clusterNode *getNodeByQuery(client *c, struct redisCommand *cmd, robj **argv, in
                 /* If it is not the first key, make sure it is exactly
                  * the same key as the first we saw. */
                 if (!equalStringObjects(firstkey,thiskey)) {
-                    if (slot != thisslot) {
+                    clusterNode* nThisKey = g_pserver->cluster->slots[thisslot];
+
+                    if ((slot != thisslot) && (nThisKey != n || migrating_slot || importing_slot || g_pserver->cluster->migrating_slots_to[slot] != nullptr || g_pserver->cluster->importing_slots_from[slot] != nullptr)) {
                         /* Error: multiple keys from different slots. */
                         getKeysFreeResult(&result);
                         if (error_code)

src/config.cpp

@@ -749,6 +749,18 @@ void loadServerConfigFromString(char *config) {
                 g_pserver->fActiveReplica = CONFIG_DEFAULT_ACTIVE_REPLICA;
                 err = "argument must be 'yes' or 'no'"; goto loaderr;
             }
+            if (listLength(g_pserver->masters) && g_pserver->fActiveReplica) {
+                err = "must not set replica-of config before active-replica config"; goto loaderr;
+            }
+        } else if (!strcasecmp(argv[0], "multi-master") && argc == 2) {
+            g_pserver->enable_multimaster = yesnotoi(argv[1]);
+            if (g_pserver->enable_multimaster == -1) {
+                g_pserver->enable_multimaster = CONFIG_DEFAULT_ENABLE_MULTIMASTER;
+                err = "argument must be 'yes' or 'no'"; goto loaderr;
+            }
+            if (listLength(g_pserver->masters) && g_pserver->enable_multimaster) {
+                err = "must not set replica-of config before multi-master config"; goto loaderr;
+            }
         } else if (!strcasecmp(argv[0], "tls-allowlist")) {
             if (argc < 2) {
                 err = "must supply at least one element in the allow list"; goto loaderr;
@@ -758,6 +770,15 @@ void loadServerConfigFromString(char *config) {
             }
             for (int i = 1; i < argc; i++)
                 g_pserver->tls_allowlist.emplace(argv[i], strlen(argv[i]));
+        } else if (!strcasecmp(argv[0], "tls-auditlog-blocklist")) {
+            if (argc < 2) {
+                err = "must supply at least one element in the block list"; goto loaderr;
+            }
+            if (!g_pserver->tls_auditlog_blocklist.empty()) {
+                err = "tls-auditlog-blocklist may only be set once"; goto loaderr;
+            }
+            for (int i = 1; i < argc; i++)
+                g_pserver->tls_auditlog_blocklist.emplace(argv[i], strlen(argv[i]));
         } else if (!strcasecmp(argv[0], "version-override") && argc == 2) {
             KEYDB_SET_VERSION = zstrdup(argv[1]);
             serverLog(LL_WARNING, "Warning version is overriden to: %s\n", KEYDB_SET_VERSION);
@@ -2100,7 +2121,10 @@ static void sdsConfigGet(client *c, typeData data) {
 }
 
 static void sdsConfigRewrite(typeData data, const char *name, struct rewriteConfigState *state) {
-    rewriteConfigSdsOption(state, name, *(data.sds.config), data.sds.default_value ? sdsnew(data.sds.default_value) : NULL);
+    sds sdsDefault = data.sds.default_value ? sdsnew(data.sds.default_value) : NULL;
+    rewriteConfigSdsOption(state, name, *(data.sds.config), sdsDefault);
+    if (sdsDefault)
+        sdsfree(sdsDefault);
 }
 
 
@@ -2573,6 +2597,19 @@ static int updateMaxmemory(long long val, long long prev, const char **err) {
     return 1;
 }
 
+static int updateFlashMaxmemory(long long val, long long prev, const char **err) {
+    UNUSED(prev);
+    UNUSED(err);
+    if (val && g_pserver->m_pstorageFactory) {
+        size_t used = g_pserver->m_pstorageFactory->totalDiskspaceUsed();
+        if ((unsigned long long)val < used) {
+            serverLog(LL_WARNING,"WARNING: the new maxstorage value set via CONFIG SET (%llu) is smaller than the current storage usage (%zu). This will result in key eviction and/or the inability to accept new write commands depending on the maxmemory-policy.", g_pserver->maxstorage, used);
+        }
+        performEvictions(false /*fPreSnapshot*/);
+    }
+    return 1;
+}
+
 static int updateGoodSlaves(long long val, long long prev, const char **err) {
     UNUSED(val);
     UNUSED(prev);
@@ -2798,7 +2835,6 @@ standardConfig configs[] = {
     createBoolConfig("replica-serve-stale-data", "slave-serve-stale-data", MODIFIABLE_CONFIG, g_pserver->repl_serve_stale_data, 1, NULL, NULL),
     createBoolConfig("replica-read-only", "slave-read-only", MODIFIABLE_CONFIG, g_pserver->repl_slave_ro, 1, NULL, NULL),
     createBoolConfig("replica-ignore-maxmemory", "slave-ignore-maxmemory", MODIFIABLE_CONFIG, g_pserver->repl_slave_ignore_maxmemory, 1, NULL, NULL),
-    createBoolConfig("multi-master", NULL, IMMUTABLE_CONFIG, g_pserver->enable_multimaster,CONFIG_DEFAULT_ENABLE_MULTIMASTER, NULL, NULL),
     createBoolConfig("jemalloc-bg-thread", NULL, MODIFIABLE_CONFIG, cserver.jemalloc_bg_thread, 1, NULL, updateJemallocBgThread),
     createBoolConfig("activedefrag", NULL, MODIFIABLE_CONFIG, cserver.active_defrag_enabled, 0, isValidActiveDefrag, NULL),
     createBoolConfig("syslog-enabled", NULL, IMMUTABLE_CONFIG, g_pserver->syslog_enabled, 0, NULL, NULL),
@@ -2885,7 +2921,7 @@ standardConfig configs[] = {
     createIntConfig("list-compress-depth", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, g_pserver->list_compress_depth, 0, INTEGER_CONFIG, NULL, NULL),
     createIntConfig("rdb-key-save-delay", NULL, MODIFIABLE_CONFIG, INT_MIN, INT_MAX, g_pserver->rdb_key_save_delay, 0, INTEGER_CONFIG, NULL, NULL),
     createIntConfig("key-load-delay", NULL, MODIFIABLE_CONFIG, INT_MIN, INT_MAX, g_pserver->key_load_delay, 0, INTEGER_CONFIG, NULL, NULL),
-    createIntConfig("active-expire-effort", NULL, MODIFIABLE_CONFIG, 1, 10, cserver.active_expire_effort, 1, INTEGER_CONFIG, NULL, NULL), /* From 1 to 10. */
+    createIntConfig("active-expire-effort", NULL, MODIFIABLE_CONFIG, 1, 10, g_pserver->active_expire_effort, 1, INTEGER_CONFIG, NULL, NULL), /* From 1 to 10. */
     createIntConfig("hz", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, g_pserver->config_hz, CONFIG_DEFAULT_HZ, INTEGER_CONFIG, NULL, updateHZ),
     createIntConfig("min-replicas-to-write", "min-slaves-to-write", MODIFIABLE_CONFIG, 0, INT_MAX, g_pserver->repl_min_slaves_to_write, 0, INTEGER_CONFIG, NULL, updateGoodSlaves),
     createIntConfig("min-replicas-max-lag", "min-slaves-max-lag", MODIFIABLE_CONFIG, 0, INT_MAX, g_pserver->repl_min_slaves_max_lag, 10, INTEGER_CONFIG, NULL, updateGoodSlaves),
@@ -2896,6 +2932,7 @@ standardConfig configs[] = {
     /* Unsigned int configs */
     createUIntConfig("maxclients", NULL, MODIFIABLE_CONFIG, 1, UINT_MAX, g_pserver->maxclients, 10000, INTEGER_CONFIG, NULL, updateMaxclients),
     createUIntConfig("loading-process-events-interval-keys", NULL, MODIFIABLE_CONFIG, 0, LONG_MAX, g_pserver->loading_process_events_interval_keys, 8192, MEMORY_CONFIG, NULL, NULL),
+    createUIntConfig("maxclients-reserved", NULL, MODIFIABLE_CONFIG, 0, 100, g_pserver->maxclientsReserved, 0, INTEGER_CONFIG, NULL,  NULL),
 
     /* Unsigned Long configs */
     createULongConfig("active-defrag-max-scan-fields", NULL, MODIFIABLE_CONFIG, 1, LONG_MAX, cserver.active_defrag_max_scan_fields, 1000, INTEGER_CONFIG, NULL, NULL), /* Default: keys with more than 1000 fields will be processed separately */
@@ -2909,14 +2946,14 @@ standardConfig configs[] = {
     createLongLongConfig("latency-monitor-threshold", NULL, MODIFIABLE_CONFIG, 0, LLONG_MAX, g_pserver->latency_monitor_threshold, 0, INTEGER_CONFIG, NULL, NULL),
     createLongLongConfig("proto-max-bulk-len", NULL, MODIFIABLE_CONFIG, 1024*1024, LLONG_MAX, g_pserver->proto_max_bulk_len, 512ll*1024*1024, MEMORY_CONFIG, NULL, NULL), /* Bulk request max size */
     createLongLongConfig("stream-node-max-entries", NULL, MODIFIABLE_CONFIG, 0, LLONG_MAX, g_pserver->stream_node_max_entries, 100, INTEGER_CONFIG, NULL, NULL),
-    createLongLongConfig("repl-backlog-size", NULL, MODIFIABLE_CONFIG, 1, LLONG_MAX, g_pserver->repl_backlog_size, 1024*1024, MEMORY_CONFIG, NULL, updateReplBacklogSize), /* Default: 1mb */
+    createLongLongConfig("repl-backlog-size", NULL, MODIFIABLE_CONFIG, 1, LLONG_MAX, g_pserver->repl_backlog_config_size, 1024*1024, MEMORY_CONFIG, NULL, updateReplBacklogSize), /* Default: 1mb */
     createLongLongConfig("repl-backlog-disk-reserve", NULL, IMMUTABLE_CONFIG, 0, LLONG_MAX, cserver.repl_backlog_disk_size, 0, MEMORY_CONFIG, NULL, NULL),
     createLongLongConfig("max-snapshot-slip", NULL, MODIFIABLE_CONFIG, 0, 5000, g_pserver->snapshot_slip, 400, 0, NULL, NULL),
     createLongLongConfig("max-rand-count", NULL, MODIFIABLE_CONFIG, 0, LONG_MAX/2, g_pserver->rand_total_threshold, LONG_MAX/2, 0, NULL, NULL),
 
     /* Unsigned Long Long configs */
     createULongLongConfig("maxmemory", NULL, MODIFIABLE_CONFIG, 0, LLONG_MAX, g_pserver->maxmemory, 0, MEMORY_CONFIG, NULL, updateMaxmemory),
-    createULongLongConfig("maxstorage", NULL, MODIFIABLE_CONFIG, 0, LLONG_MAX, g_pserver->maxstorage, 0, MEMORY_CONFIG, NULL, NULL),
+    createULongLongConfig("maxstorage", NULL, MODIFIABLE_CONFIG, 0, LLONG_MAX, g_pserver->maxstorage, 0, MEMORY_CONFIG, NULL, updateFlashMaxmemory),
 
     /* Size_t configs */
     createSizeTConfig("hash-max-ziplist-entries", NULL, MODIFIABLE_CONFIG, 0, LONG_MAX, g_pserver->hash_max_ziplist_entries, 512, INTEGER_CONFIG, NULL, NULL),
@@ -2942,6 +2979,11 @@ standardConfig configs[] = {
     createBoolConfig("soft-shutdown", NULL, MODIFIABLE_CONFIG, g_pserver->config_soft_shutdown, 0, NULL, NULL),
     createBoolConfig("flash-disable-key-cache", NULL, MODIFIABLE_CONFIG, g_pserver->flash_disable_key_cache, 0, NULL, NULL),
     createSizeTConfig("semi-ordered-set-bucket-size", NULL, MODIFIABLE_CONFIG, 0, 1024, g_semiOrderedSetTargetBucketSize, 0, INTEGER_CONFIG, NULL, NULL),
+    createSDSConfig("availability-zone", NULL, MODIFIABLE_CONFIG, 0, g_pserver->sdsAvailabilityZone, "", NULL, NULL),
+    createIntConfig("overload-protect-percent", NULL, MODIFIABLE_CONFIG, 0, 200, g_pserver->overload_protect_threshold, 0, INTEGER_CONFIG, NULL, NULL),
+    createIntConfig("force-eviction-percent", NULL, MODIFIABLE_CONFIG, 0, 100, g_pserver->force_eviction_percent, 0, INTEGER_CONFIG, NULL, NULL),
+    createBoolConfig("enable-async-rehash", NULL, MODIFIABLE_CONFIG, g_pserver->enable_async_rehash, 1, NULL, NULL),
+    createBoolConfig("enable-keydb-fastsync", NULL, MODIFIABLE_CONFIG, g_pserver->fEnableFastSync, 0, NULL, NULL),
 
 #ifdef USE_OPENSSL
     createIntConfig("tls-port", NULL, MODIFIABLE_CONFIG, 0, 65535, g_pserver->tls_port, 0, INTEGER_CONFIG, NULL, updateTLSPort), /* TCP port. */

src/connection.cpp

@@ -161,6 +161,11 @@ static void connSocketClose(connection *conn) {
         return;
     }
 
+    if (conn->fprint) {
+        zfree(conn->fprint);
+        conn->fprint = NULL;
+    }
+
     zfree(conn);
 }
 

src/connection.h

@@ -51,6 +51,7 @@ typedef enum {
 #define CONN_FLAG_WRITE_BARRIER     (1<<1)      /* Write barrier requested */
 #define CONN_FLAG_READ_THREADSAFE        (1<<2)
 #define CONN_FLAG_WRITE_THREADSAFE       (1<<3)
+#define CONN_FLAG_AUDIT_LOGGING_REQUIRED (1<<4)
 
 #define CONN_TYPE_SOCKET            1
 #define CONN_TYPE_TLS               2
@@ -86,6 +87,7 @@ struct connection {
     ConnectionCallbackFunc write_handler;
     ConnectionCallbackFunc read_handler;
     int fd;
+    char* fprint;
 };
 
 /* The connection module does not deal with listening and accepting sockets,

src/db.cpp

@@ -55,8 +55,7 @@ struct dbBackup {
 int expireIfNeeded(redisDb *db, robj *key, robj *o);
 void slotToKeyUpdateKeyCore(const char *key, size_t keylen, int add);
 
-std::unique_ptr<expireEntry> deserializeExpire(sds key, const char *str, size_t cch, size_t *poffset);
-sds serializeStoredObjectAndExpire(redisDbPersistentData *db, const char *key, robj_roptr o);
+std::unique_ptr<expireEntry> deserializeExpire(const char *str, size_t cch, size_t *poffset);
 
 dictType dictChangeDescType {
     dictSdsHash,                /* hash function */
@@ -83,6 +82,7 @@ void updateExpire(redisDb *db, sds key, robj *valOld, robj *valNew)
     
     serverAssert(db->FKeyExpires((const char*)key));
     
+    valNew->expire = std::move(valOld->expire);
     valNew->SetFExpires(true);
     valOld->SetFExpires(false);
     return;
@@ -281,8 +281,8 @@ robj *lookupKeyWriteOrReply(client *c, robj *key, robj *reply) {
     return o;
 }
 
-bool dbAddCore(redisDb *db, sds key, robj *val, bool fUpdateMvcc, bool fAssumeNew = false, dict_iter *piterExisting = nullptr) {
-    serverAssert(!val->FExpires());
+bool dbAddCore(redisDb *db, sds key, robj *val, bool fUpdateMvcc, bool fAssumeNew = false, dict_iter *piterExisting = nullptr, bool fValExpires = false) {
+    serverAssert(fValExpires || !val->FExpires());
     sds copy = sdsdupshared(key);
     
     uint64_t mvcc = getMvccTstamp();
@@ -1059,7 +1059,7 @@ void keysCommand(client *c) {
     sds pattern = szFromObj(c->argv[1]);
 
     const redisDbPersistentDataSnapshot *snapshot = nullptr;
-    if (!(c->flags & (CLIENT_MULTI | CLIENT_BLOCKED | CLIENT_DENY_BLOCKING)))
+    if (!(c->flags & (CLIENT_MULTI | CLIENT_BLOCKED | CLIENT_DENY_BLOCKING)) && !(serverTL->in_eval || serverTL->in_exec))
         snapshot = c->db->createSnapshot(c->mvccCheckpoint, true /* fOptional */);
     if (snapshot != nullptr)
     {
@@ -1224,7 +1224,7 @@ void scanGenericCommand(client *c, robj_roptr o, unsigned long cursor) {
         }
     }
 
-    if (o == nullptr && count >= 100)
+    if (o == nullptr && count >= 100 && !(serverTL->in_eval || serverTL->in_exec))
     {
         // Do an async version
         if (c->asyncCommand(
@@ -1494,15 +1494,6 @@ void renameGenericCommand(client *c, int nx) {
 
     incrRefCount(o);
 
-    std::unique_ptr<expireEntry> spexpire;
-
-    {   // scope pexpireOld since it will be invalid soon
-    std::unique_lock<fastlock> ul(g_expireLock);
-    expireEntry *pexpireOld = c->db->getExpire(c->argv[1]);
-    if (pexpireOld != nullptr)
-        spexpire = std::make_unique<expireEntry>(std::move(*pexpireOld));
-    }
-
     if (lookupKeyWrite(c->db,c->argv[2]) != NULL) {
         if (nx) {
             decrRefCount(o);
@@ -1513,10 +1504,12 @@ void renameGenericCommand(client *c, int nx) {
          * with the same name. */
         dbDelete(c->db,c->argv[2]);
     }
+    bool fExpires = o->FExpires();
+    long long whenT = o->expire.when();
     dbDelete(c->db,c->argv[1]);
-    dbAdd(c->db,c->argv[2],o);
-    if (spexpire != nullptr) 
-        setExpire(c,c->db,c->argv[2],std::move(*spexpire));
+    o->SetFExpires(fExpires);
+    dbAddCore(c->db,szFromObj(c->argv[2]),o,true /*fUpdateMvcc*/,true/*fAssumeNew*/,nullptr,true/*fValExpires*/);
+    serverAssert(whenT == o->expire.when());    // dbDelete and dbAdd must not modify the expire, just the FExpire bit
     signalModifiedKey(c,c->db,c->argv[1]);
     signalModifiedKey(c,c->db,c->argv[2]);
     notifyKeyspaceEvent(NOTIFY_GENERIC,"rename_from",
@@ -1579,22 +1572,15 @@ void moveCommand(client *c) {
         return;
     }
 
-    std::unique_ptr<expireEntry> spexpire;
-    {   // scope pexpireOld
-    std::unique_lock<fastlock> ul(g_expireLock);
-    expireEntry *pexpireOld = c->db->getExpire(c->argv[1]);
-    if (pexpireOld != nullptr)
-        spexpire = std::make_unique<expireEntry>(std::move(*pexpireOld));
-    }
-    if (o->FExpires())
-        removeExpire(c->db,c->argv[1]);
-    serverAssert(!o->FExpires());
     incrRefCount(o);
+    bool fExpire = o->FExpires();
+    long long whenT = o->expire.when();
     dbDelete(src,c->argv[1]);
     g_pserver->dirty++;
 
-    dbAdd(dst,c->argv[1],o);
-    if (spexpire != nullptr) setExpire(c,dst,c->argv[1],std::move(*spexpire));
+    o->SetFExpires(fExpire);
+    dbAddCore(dst, szFromObj(c->argv[1]), o, true /*fUpdateMvcc*/, true /*fAssumeNew*/, nullptr, true /*fValExpires*/);
+    serverAssert(whenT == o->expire.when());    // add/delete must not modify the expire time
 
     signalModifiedKey(c,src,c->argv[1]);
     signalModifiedKey(c,dst,c->argv[1]);
@@ -1662,7 +1648,7 @@ void copyCommand(client *c) {
         addReply(c,shared.czero);
         return;
     }
-    expire = c->db->getExpire(key);
+    expire = o->FExpires() ? &o->expire : nullptr;
 
     /* Return zero if the key already exists in the target DB. 
      * If REPLACE option is selected, delete newkey from targetDB. */
@@ -1769,7 +1755,7 @@ int dbSwapDatabases(int id1, int id2) {
 
 /* SWAPDB db1 db2 */
 void swapdbCommand(client *c) {
-    int id1, id2, oriId;
+    int id1, id2, oriIdx;
 
     /* Not allowed in cluster mode: we have just DB 0 there. */
     if (g_pserver->cluster_enabled) {
@@ -1786,8 +1772,13 @@ void swapdbCommand(client *c) {
         "invalid second DB index") != C_OK)
         return;
 
-    //get client's original db's id
-    oriId=c->db->id;
+    // get client's original db's index
+    for (int idb=0; idb < cserver.dbnum; ++idb) {
+        if (g_pserver->db[idb]->id == c->db->id) {
+            oriIdx = idb;
+            break;
+        }
+    }
 
     /* Swap... */
     if (dbSwapDatabases(id1,id2) == C_ERR) {
@@ -1798,9 +1789,17 @@ void swapdbCommand(client *c) {
         moduleFireServerEvent(REDISMODULE_EVENT_SWAPDB,0,&si);
         g_pserver->dirty++;
 
-	//set client's db to original db
-        c->db=g_pserver->db[oriId];
+        // set client's db to original db
+        c->db=g_pserver->db[oriIdx];
 
+        // Persist the databse index to dbid mapping into FLASH for later recovery.
+        if (g_pserver->m_pstorageFactory != nullptr && g_pserver->metadataDb != nullptr) {
+            std::string dbid_key = "db-" + std::to_string(id1);
+            g_pserver->metadataDb->insert(dbid_key.c_str(), dbid_key.length(), &g_pserver->db[id1]->id, sizeof(g_pserver->db[id1]->id), true);
+
+            dbid_key = "db-" + std::to_string(id2);
+            g_pserver->metadataDb->insert(dbid_key.c_str(), dbid_key.length(), &g_pserver->db[id2]->id, sizeof(g_pserver->db[id2]->id), true);
+        }
         addReply(c,shared.ok);
     }
 }
@@ -1816,63 +1815,48 @@ int redisDbPersistentData::removeExpire(robj *key, dict_iter itr) {
     /* An expire may only be removed if there is a corresponding entry in the
      * main dict. Otherwise, the key will never be freed. */
     serverAssertWithInfo(NULL,key,itr != nullptr);
-    std::unique_lock<fastlock> ul(g_expireLock);
 
     robj *val = itr.val();
     if (!val->FExpires())
         return 0;
 
     trackkey(key, true /* fUpdate */);
-    auto itrExpire = m_setexpire->find(itr.key());
-    serverAssert(itrExpire != m_setexpire->end());
-    m_setexpire->erase(itrExpire);
     val->SetFExpires(false);
+    serverAssert(m_numexpires > 0);
+    m_numexpires--;
     return 1;
 }
 
 int redisDbPersistentData::removeSubkeyExpire(robj *key, robj *subkey) {
     auto de = find(szFromObj(key));
     serverAssertWithInfo(NULL,key,de != nullptr);
-    std::unique_lock<fastlock> ul(g_expireLock);
 
     robj *val = de.val();
     if (!val->FExpires())
         return 0;
-    
-    auto itr = m_setexpire->find(de.key());
-    serverAssert(itr != m_setexpire->end());
-    serverAssert(itr->key() == de.key());
-    if (!itr->FFat())
+
+    if (!val->expire.FFat())
         return 0;
 
     int found = 0;
-    for (auto subitr : *itr)
+    for (auto subitr : val->expire)
     {
         if (subitr.subkey() == nullptr)
             continue;
         if (sdscmp((sds)subitr.subkey(), szFromObj(subkey)) == 0)
         {
-            itr->erase(subitr);
+            val->expire.erase(subitr);
             found = 1;
             break;
         }
     }
 
-    if (itr->pfatentry()->size() == 0)
+    if (val->expire.pfatentry()->size() == 0)
         this->removeExpire(key, de);
 
     return found;
 }
 
-void redisDbPersistentData::resortExpire(expireEntry &e)
-{
-    std::unique_lock<fastlock> ul(g_expireLock);
-    auto itr = m_setexpire->find(e.key());
-    expireEntry eT = std::move(e);
-    m_setexpire->erase(itr);
-    m_setexpire->insert(eT);
-}
-
 /* Set an expire to the specified key. If the expire is set in the context
  * of an user calling a command 'c' is the client, otherwise 'c' is set
  * to NULL. The 'when' parameter is the absolute unix time in milliseconds
@@ -1927,10 +1911,7 @@ void setExpire(client *c, redisDb *db, robj *key, expireEntry &&e)
     if (kde.val()->FExpires())
         removeExpire(db, key);
 
-    e.setKeyUnsafe(kde.key());
-    db->setExpire(std::move(e));
-    kde.val()->SetFExpires(true);
-
+    db->setExpire(kde.key(), std::move(e));
 
     int writable_slave = listLength(g_pserver->masters) && g_pserver->repl_slave_ro == 0 && !g_pserver->fActiveReplica;
     if (c && writable_slave && !(c->flags & CLIENT_MASTER))
@@ -1941,14 +1922,15 @@ void setExpire(client *c, redisDb *db, robj *key, expireEntry &&e)
  * is associated with this key (i.e. the key is non volatile) */
 expireEntry *redisDbPersistentDataSnapshot::getExpire(const char *key) {
     /* No expire? return ASAP */
-    std::unique_lock<fastlock> ul(g_expireLock);
     if (expireSize() == 0)
         return nullptr;
 
-    auto itrExpire = m_setexpire->find(key);
-    if (itrExpire == m_setexpire->end())
+    auto itr = find_cached_threadsafe(key);
+    if (itr == end())
         return nullptr;
-    return itrExpire.operator->();
+    if (!itr.val()->FExpires())
+        return nullptr;
+    return &itr.val()->expire;
 }
 
 const expireEntry *redisDbPersistentDataSnapshot::getExpire(const char *key) const
@@ -2049,15 +2031,13 @@ int keyIsExpired(const redisDbPersistentDataSnapshot *db, robj *key) {
     /* Don't expire anything while loading. It will be done later. */
     if (g_pserver->loading) return 0;
     
-    std::unique_lock<fastlock> ul(g_expireLock);
     const expireEntry *pexpire = db->getExpire(key);
     mstime_t now;
+    long long when;
 
     if (pexpire == nullptr) return 0; /* No expire for this key */
 
-    long long when = pexpire->FGetPrimaryExpire();
-
-    if (when == INVALID_EXPIRE)
+    if (!pexpire->FGetPrimaryExpire(&when))
         return 0;
 
     /* If we are in the context of a Lua script, we pretend that time is
@@ -2619,7 +2599,6 @@ void redisDbPersistentData::initialize()
     m_pdbSnapshot = nullptr;
     m_pdict = dictCreate(&dbDictType,this);
     m_pdictTombstone = dictCreate(&dbTombstoneDictType,this);
-    m_setexpire = new(MALLOC_LOCAL) expireset();
     m_fAllChanged = 0;
     m_fTrackingChanges = 0;
 }
@@ -2655,7 +2634,6 @@ void moduleClusterLoadCallback(const char * rgchKey, size_t cchKey, void *data)
 void redisDb::initialize(int id)
 {
     redisDbPersistentData::initialize();
-    this->expireitr = setexpire()->end();
     this->blocking_keys = dictCreate(&keylistDictType,NULL);
     this->ready_keys = dictCreate(&objectKeyPointerValueDictType,NULL);
     this->watched_keys = dictCreate(&keylistDictType,NULL);
@@ -2701,6 +2679,8 @@ bool redisDbPersistentData::insert(char *key, robj *o, bool fAssumeNew, dict_ite
             serverAssert(dictFind(m_pdictTombstone, key) != nullptr);
         }
 #endif
+        if (o->FExpires())
+            ++m_numexpires;
         trackkey(key, false /* fUpdate */);
     }
     else
@@ -2722,11 +2702,6 @@ void redisDbPersistentData::prepOverwriteForSnapshot(char *key)
         auto itr = m_pdbSnapshot->find_cached_threadsafe(key);
         if (itr.key() != nullptr)
         {
-            if (itr.val()->FExpires()) {
-                // Note: I'm sure we could handle this, but its too risky at the moment.
-                //  There are known bugs doing this with expires
-                return;
-            }
             sds keyNew = sdsdupshared(itr.key());
             if (dictAdd(m_pdictTombstone, keyNew, (void*)dictHashKey(m_pdict, key)) != DICT_OK)
                 sdsfree(keyNew);
@@ -2748,7 +2723,7 @@ size_t redisDb::clear(bool fAsync, void(callback)(void*))
     } else {
         redisDbPersistentData::clear(callback);
     }
-    expireitr = setexpire()->end();
+    expires_cursor = 0;
     return removed;
 }
 
@@ -2761,59 +2736,64 @@ void redisDbPersistentData::clear(void(callback)(void*))
         m_cnewKeysPending = 0;
         m_fAllChanged++;
     }
-    {
-    std::unique_lock<fastlock> ul(g_expireLock);
-    delete m_setexpire;
-    m_setexpire = new (MALLOC_LOCAL) expireset();
-    }
     if (m_spstorage != nullptr)
         m_spstorage->clear(callback);
     dictEmpty(m_pdictTombstone,callback);
+
+    // To avoid issues with async rehash we completly free the old dict and create a fresh one
+    dictRelease(m_pdict);
+    dictRelease(m_pdictTombstone);
+    m_pdict = dictCreate(&dbDictType, this);
+    m_pdictTombstone = dictCreate(&dbTombstoneDictType, this);
+
     m_pdbSnapshot = nullptr;
+    m_numexpires = 0;
 }
 
 void redisDbPersistentData::setExpire(robj *key, robj *subkey, long long when)
 {
     /* Reuse the sds from the main dict in the expire dict */
-    std::unique_lock<fastlock> ul(g_expireLock);
     dictEntry *kde = dictFind(m_pdict,ptrFromObj(key));
     serverAssertWithInfo(NULL,key,kde != NULL);
     trackkey(key, true /* fUpdate */);
 
-    if (((robj*)dictGetVal(kde))->getrefcount(std::memory_order_relaxed) == OBJ_SHARED_REFCOUNT)
+    robj *o = (robj*)dictGetVal(kde);
+    if (o->getrefcount(std::memory_order_relaxed) == OBJ_SHARED_REFCOUNT)
     {
         // shared objects cannot have the expire bit set, create a real object
-        dictSetVal(m_pdict, kde, dupStringObject((robj*)dictGetVal(kde)));
+        dictSetVal(m_pdict, kde, dupStringObject(o));
+        o = (robj*)dictGetVal(kde);
     }
 
     const char *szSubKey = (subkey != nullptr) ? szFromObj(subkey) : nullptr;
-    if (((robj*)dictGetVal(kde))->FExpires()) {
-        auto itr = m_setexpire->find((sds)dictGetKey(kde));
-        serverAssert(itr != m_setexpire->end());
-        expireEntry eNew(std::move(*itr));
-        eNew.update(szSubKey, when);
-        m_setexpire->erase(itr);
-        m_setexpire->insert(eNew);
+    if (o->FExpires()) {
+        o->expire.update(szSubKey, when);
     }
     else
     {
-        expireEntry e((sds)dictGetKey(kde), szSubKey, when);
-        ((robj*)dictGetVal(kde))->SetFExpires(true);
-        m_setexpire->insert(e);
+        expireEntry e(szSubKey, when);
+        o->expire = std::move(e);
+        o->SetFExpires(true);
+        ++m_numexpires;
     }
 }
 
-void redisDbPersistentData::setExpire(expireEntry &&e)
+void redisDbPersistentData::setExpire(const char *key, expireEntry &&e)
 {
-    std::unique_lock<fastlock> ul(g_expireLock);
-    trackkey(e.key(), true /* fUpdate */);
-    m_setexpire->insert(e);
+    trackkey(key, true /* fUpdate */);
+    auto itr = find(key);
+    if (!itr->FExpires())
+        m_numexpires++;
+    itr->expire = std::move(e);
+    itr->SetFExpires(true);
 }
 
 bool redisDb::FKeyExpires(const char *key)
 {
-    std::unique_lock<fastlock> ul(g_expireLock);
-    return setexpireUnsafe()->find(key) != setexpire()->end();
+    auto itr = find(key);
+    if (itr == end())
+        return false;
+    return itr->FExpires();
 }
 
 void redisDbPersistentData::updateValue(dict_iter itr, robj *val)
@@ -2837,7 +2817,6 @@ void redisDbPersistentData::ensure(const char *sdsKey, dictEntry **pde)
     serverAssert(m_refCount == 0);
     if (m_pdbSnapshot == nullptr && g_pserver->m_pstorageFactory == nullptr)
         return;
-    std::unique_lock<fastlock> ul(g_expireLock);
 
     // First see if the key can be obtained from a snapshot
     if (*pde == nullptr && m_pdbSnapshot != nullptr)
@@ -2859,7 +2838,11 @@ void redisDbPersistentData::ensure(const char *sdsKey, dictEntry **pde)
                 else
                 {
                     sds strT = serializeStoredObject(itr.val());
-                    robj *objNew = deserializeStoredObject(this, sdsKey, strT, sdslen(strT));
+                    robj *objNew = deserializeStoredObject(strT, sdslen(strT));
+                    if (itr->FExpires()) {
+                        objNew->expire = itr->expire;
+                        objNew->SetFExpires(true);
+                    }
                     sdsfree(strT);
                     dictAdd(m_pdict, keyNew, objNew);
                     serverAssert(objNew->getrefcount(std::memory_order_relaxed) == 1);
@@ -2889,26 +2872,19 @@ LNotFound:
             std::unique_ptr<expireEntry> spexpire;
             m_spstorage->retrieve((sds)sdsKey, [&](const char *, size_t, const void *data, size_t cb){
                 size_t offset = 0;
-                spexpire = deserializeExpire(sdsNewKey, (const char*)data, cb, &offset);    
-                o = deserializeStoredObject(this, sdsNewKey, reinterpret_cast<const char*>(data) + offset, cb - offset);
+                spexpire = deserializeExpire((const char*)data, cb, &offset);    
+                o = deserializeStoredObject(reinterpret_cast<const char*>(data) + offset, cb - offset);
                 serverAssert(o != nullptr);
             });
             
             if (o != nullptr)
             {
                 dictAdd(m_pdict, sdsNewKey, o);
-                o->SetFExpires(spexpire != nullptr);
                 
-                std::unique_lock<fastlock> ul(g_expireLock);
-                if (spexpire != nullptr)
-                {
-                    auto itr = m_setexpire->find(sdsKey);
-                    if (itr != m_setexpire->end())
-                        m_setexpire->erase(itr);
-                    m_setexpire->insert(std::move(*spexpire));
-                    serverAssert(m_setexpire->find(sdsKey) != m_setexpire->end());
+                o->SetFExpires(spexpire != nullptr);
+                if (spexpire != nullptr) {
+                    o->expire = std::move(*spexpire);
                 }
-                serverAssert(o->FExpires() == (m_setexpire->find(sdsKey) != m_setexpire->end()));
                 g_pserver->stat_storage_provider_read_hits++;
             } else {
                 sdsfree(sdsNewKey);
@@ -2918,18 +2894,11 @@ LNotFound:
             *pde = dictFind(m_pdict, sdsKey);
         }
     }
-
-    if (*pde != nullptr && dictGetVal(*pde) != nullptr)
-    {
-        robj *o = (robj*)dictGetVal(*pde);
-        std::unique_lock<fastlock> ul(g_expireLock);
-        serverAssert(o->FExpires() == (m_setexpire->find(sdsKey) != m_setexpire->end()));
-    }
 }
 
 void redisDbPersistentData::storeKey(sds key, robj *o, bool fOverwrite)
 {
-    sds temp = serializeStoredObjectAndExpire(this, key, o);
+    sds temp = serializeStoredObjectAndExpire(o);
     m_spstorage->insert(key, temp, sdslen(temp), fOverwrite);
     sdsfree(temp);
 }
@@ -2953,7 +2922,7 @@ void redisDbPersistentData::storeDatabase()
     if (itr == nullptr)
         return;
     robj *o = itr.val();
-    sds temp = serializeStoredObjectAndExpire(db, (const char*) itr.key(), o);
+    sds temp = serializeStoredObjectAndExpire(o);
     storage->insert((sds)key, temp, sdslen(temp), fUpdate);
     sdsfree(temp);
 }
@@ -3029,7 +2998,7 @@ void redisDbPersistentData::processChangesAsync(std::atomic<int> &pendingJobs)
         while ((de = dictNext(di)) != nullptr)
         {
             robj *o = (robj*)dictGetVal(de);
-            sds temp = serializeStoredObjectAndExpire(this, (const char*) dictGetKey(de), o);
+            sds temp = serializeStoredObjectAndExpire(o);
             veckeys.push_back((sds)dictGetKey(de));
             veccbkeys.push_back(sdslen((sds)dictGetKey(de)));
             vecvals.push_back(temp);
@@ -3093,9 +3062,7 @@ redisDbPersistentData::~redisDbPersistentData()
     if (m_dictChanged)
         dictRelease(m_dictChanged);
     if (m_dictChangedStorageFlush)
-        dictRelease(m_dictChangedStorageFlush);
-    
-    delete m_setexpire;
+        dictRelease(m_dictChangedStorageFlush);    
 }
 
 dict_iter redisDbPersistentData::random()
@@ -3249,7 +3216,7 @@ sds serializeExpire(const expireEntry *pexpire)
     return str;
 }
 
-std::unique_ptr<expireEntry> deserializeExpire(sds key, const char *str, size_t cch, size_t *poffset)
+std::unique_ptr<expireEntry> deserializeExpire(const char *str, size_t cch, size_t *poffset)
 {
     unsigned celem;
     if (cch < sizeof(unsigned))
@@ -3281,25 +3248,21 @@ std::unique_ptr<expireEntry> deserializeExpire(sds key, const char *str, size_t
         offset += sizeof(long long);
 
         if (spexpire == nullptr)
-            spexpire = std::make_unique<expireEntry>(key, subkey, when);
+            spexpire = std::make_unique<expireEntry>(subkey, when);
         else
             spexpire->update(subkey, when);
 
         if (subkey)
             sdsfree(subkey);
     }
-
-    *poffset = offset;
+    if (poffset != nullptr)
+        *poffset = offset;
     return spexpire;
 }
 
-sds serializeStoredObjectAndExpire(redisDbPersistentData *db, const char *key, robj_roptr o)
+sds serializeStoredObjectAndExpire(robj_roptr o)
 {
-    std::unique_lock<fastlock> ul(g_expireLock);
-    auto itrExpire = db->setexpire()->find(key);
-    const expireEntry *pexpire = nullptr;
-    if (itrExpire != db->setexpire()->end())
-        pexpire = &(*itrExpire);
+    const expireEntry *pexpire = o->FExpires() ?  &o->expire : nullptr;
 
     sds str = serializeExpire(pexpire);
     str = serializeStoredObject(o, str);
@@ -3382,8 +3345,8 @@ void redisDbPersistentData::prefetchKeysAsync(client *c, parsed_command &command
         robj *o = nullptr;
         m_spstorage->retrieve((sds)szFromObj(objKey), [&](const char *, size_t, const void *data, size_t cb){
                 size_t offset = 0;
-                spexpire = deserializeExpire(sharedKey, (const char*)data, cb, &offset);    
-                o = deserializeStoredObject(this, sharedKey, reinterpret_cast<const char*>(data) + offset, cb - offset);
+                spexpire = deserializeExpire((const char*)data, cb, &offset);    
+                o = deserializeStoredObject(reinterpret_cast<const char*>(data) + offset, cb - offset);
                 serverAssert(o != nullptr);
         });
 
@@ -3418,18 +3381,9 @@ void redisDbPersistentData::prefetchKeysAsync(client *c, parsed_command &command
                         }
                     }
                     dictAdd(m_pdict, sharedKey, o);
-                    o->SetFExpires(spexpire != nullptr);
-
-                    std::unique_lock<fastlock> ul(g_expireLock);
                     if (spexpire != nullptr)
-                    {
-                        auto itr = m_setexpire->find(sharedKey);
-                        if (itr != m_setexpire->end())
-                            m_setexpire->erase(itr);
-                        m_setexpire->insert(std::move(*spexpire));
-                        serverAssert(m_setexpire->find(sharedKey) != m_setexpire->end());
-                    }
-                    serverAssert(o->FExpires() == (m_setexpire->find(sharedKey) != m_setexpire->end()));
+                        o->expire = std::move(*spexpire);
+                    o->SetFExpires(spexpire != nullptr);
                 }
             }
             else

src/debug.cpp

@@ -79,6 +79,7 @@ void printCrashReport(void);
 void bugReportEnd(int killViaSignal, int sig);
 void logStackTrace(void *eip, int uplevel);
 void getTempFileName(char tmpfile[], int tmpfileNum);
+bool initializeStorageProvider(const char **err);
 
 /* ================================= Debugging ============================== */
 
@@ -146,11 +147,10 @@ void mixStringObjectDigest(unsigned char *digest, robj_roptr o) {
  * Note that this function does not reset the initial 'digest' passed, it
  * will continue mixing this object digest to anything that was already
  * present. */
-void xorObjectDigest(redisDb *db, robj_roptr keyobj, unsigned char *digest, robj_roptr o) {
+void xorObjectDigest(unsigned char *digest, robj_roptr o) {
     uint32_t aux = htonl(o->type);
     mixDigest(digest,&aux,sizeof(aux));
-    std::unique_lock<fastlock> ul(g_expireLock);
-    expireEntry *pexpire = db->getExpire(keyobj);
+    const expireEntry *pexpire = o->FExpires() ? &o->expire : nullptr;
     long long expiretime = INVALID_EXPIRE;
     char buf[128];
 
@@ -309,7 +309,7 @@ void computeDatasetDigest(unsigned char *final) {
         mixDigest(final,&aux,sizeof(aux));
 
         /* Iterate this DB writing every entry */
-        db->iterate_threadsafe([final, db](const char *key, robj_roptr o)->bool {
+        db->iterate_threadsafe([final](const char *key, robj_roptr o)->bool {
             unsigned char digest[20];
             robj *keyobj;
 
@@ -318,7 +318,7 @@ void computeDatasetDigest(unsigned char *final) {
 
             mixDigest(digest,key,sdslen(key));
 
-            xorObjectDigest(db,keyobj,digest,o);
+            xorObjectDigest(digest,o);
 
             /* We can finally xor the key-val digest to the final digest */
             xorDigest(final,digest,20);
@@ -536,30 +536,75 @@ NULL
                 return;
             }
         }
+        
+        if (g_pserver->m_pstorageFactory) {
+            protectClient(c);
 
-        /* The default behavior is to save the RDB file before loading
-         * it back. */
-        if (save) {
-            rdbSaveInfo rsi, *rsiptr;
-            rsiptr = rdbPopulateSaveInfo(&rsi);
-            if (rdbSave(nullptr, rsiptr) != C_OK) {
-                addReply(c,shared.err);
+            for (int idb = 0; idb < cserver.dbnum; ++idb) {
+                if (g_pserver->db[idb]->processChanges(false))
+                    g_pserver->db[idb]->commitChanges();
+                g_pserver->db[idb]->storageProviderDelete();
+            }
+            delete g_pserver->metadataDb;
+
+            if (flush) emptyDb(-1,EMPTYDB_NO_FLAGS,NULL);
+
+            delete g_pserver->m_pstorageFactory;
+
+            const char *err;
+            if (!initializeStorageProvider(&err))
+            {
+                serverLog(LL_WARNING, "Failed to initialize storage provider: %s",err);
+                exit(EXIT_FAILURE);
+            }
+
+            g_pserver->metadataDb = g_pserver->m_pstorageFactory->createMetadataDb();
+            for (int idb = 0; idb < cserver.dbnum; ++idb)
+            {
+                int dbid = idb;
+                std::string dbid_key = "db-" + std::to_string(idb);
+                g_pserver->metadataDb->retrieve(dbid_key.c_str(), dbid_key.length(), [&](const char *, size_t, const void *data, size_t){
+                    dbid = *(int*)data;
+                });
+                delete g_pserver->db[idb];
+                g_pserver->db[idb] = new (MALLOC_LOCAL) redisDb();
+                g_pserver->db[idb]->initialize(dbid);
+            }
+
+            moduleFireServerEvent(REDISMODULE_EVENT_LOADING, REDISMODULE_SUBEVENT_LOADING_FLASH_START, NULL);
+            for (int idb = 0; idb < cserver.dbnum; ++idb)
+            {
+                g_pserver->db[idb]->storageProviderInitialize();
+                g_pserver->db[idb]->trackChanges(false);
+            }
+            moduleFireServerEvent(REDISMODULE_EVENT_LOADING, REDISMODULE_SUBEVENT_LOADING_ENDED, NULL);
+            
+            unprotectClient(c);
+        } else {
+            /* The default behavior is to save the RDB file before loading
+            * it back. */
+            if (save) {
+                rdbSaveInfo rsi, *rsiptr;
+                rsiptr = rdbPopulateSaveInfo(&rsi);
+                if (rdbSave(nullptr, rsiptr) != C_OK) {
+                    addReply(c,shared.err);
+                    return;
+                }
+            }
+
+            /* The default behavior is to remove the current dataset from
+            * memory before loading the RDB file, however when MERGE is
+            * used together with NOFLUSH, we are able to merge two datasets. */
+            if (flush) emptyDb(-1,EMPTYDB_NO_FLAGS,NULL);
+
+            protectClient(c);
+            int ret = rdbLoadFile(g_pserver->rdb_filename,NULL,flags);
+            unprotectClient(c);
+            if (ret != C_OK) {
+                addReplyError(c,"Error trying to load the RDB dump");
                 return;
             }
         }
-
-        /* The default behavior is to remove the current dataset from
-         * memory before loading the RDB file, however when MERGE is
-         * used together with NOFLUSH, we are able to merge two datasets. */
-        if (flush) emptyDb(-1,EMPTYDB_NO_FLAGS,NULL);
-
-        protectClient(c);
-        int ret = rdbLoadFile(g_pserver->rdb_filename,NULL,flags);
-        unprotectClient(c);
-        if (ret != C_OK) {
-            addReplyError(c,"Error trying to load the RDB dump");
-            return;
-        }
         serverLog(LL_WARNING,"DB reloaded by DEBUG RELOAD");
         addReply(c,shared.ok);
     } else if (!strcasecmp(szFromObj(c->argv[1]),"loadaof")) {
@@ -716,7 +761,7 @@ NULL
              * work on logically expired keys */
             auto itr = c->db->find(c->argv[j]);
             robj* o = (robj*)(itr == NULL ? NULL : itr.val());
-            if (o) xorObjectDigest(c->db,c->argv[j],digest,o);
+            if (o) xorObjectDigest(digest,o);
 
             sds d = sdsempty();
             for (int i = 0; i < 20; i++) d = sdscatprintf(d, "%02x",digest[i]);
@@ -843,10 +888,6 @@ NULL
         g_pserver->db[dbid]->getStats(buf,sizeof(buf));
         stats = sdscat(stats,buf);
 
-        stats = sdscatprintf(stats,"[Expires set]\n");
-        g_pserver->db[dbid]->getExpireStats(buf, sizeof(buf));
-        stats = sdscat(stats, buf);
-
         addReplyVerbatim(c,stats,sdslen(stats),"txt");
         sdsfree(stats);
     } else if (!strcasecmp(szFromObj(c->argv[1]),"htstats-key") && c->argc == 3) {
@@ -937,6 +978,21 @@ NULL
         mallctl_string(c, c->argv+2, c->argc-2);
         return;
 #endif
+    } else if(!strcasecmp(szFromObj(c->argv[1]),"flush-storage") && c->argc == 2) {
+        if (g_pserver->m_pstorageFactory != nullptr) {
+            for (int i = 0; i < cserver.dbnum; i++) {
+                g_pserver->db[i]->getStorageCache()->flush();
+            }
+            addReply(c,shared.ok);
+        } else {
+            addReplyError(c, "Can't flush storage if no storage provider is set");
+        }
+    } else if (!strcasecmp(szFromObj(c->argv[1]),"get-storage-usage") && c->argc == 2) {
+        if (g_pserver->m_pstorageFactory != nullptr) {
+            addReplyLongLong(c, g_pserver->m_pstorageFactory->totalDiskspaceUsed());
+        } else {
+            addReplyLongLong(c, 0);
+        }
     } else {
         addReplySubcommandSyntaxError(c);
         return;

src/defrag.cpp

@@ -47,7 +47,6 @@ extern "C" int je_get_defrag_hint(void* ptr);
 /* forward declarations*/
 void defragDictBucketCallback(void *privdata, dictEntry **bucketref);
 dictEntry* replaceSatelliteDictKeyPtrAndOrDefragDictEntry(dict *d, sds oldkey, sds newkey, uint64_t hash, long *defragged);
-bool replaceSatelliteOSetKeyPtr(expireset &set, sds oldkey, sds newkey);
 
 /* Defrag helper for generic allocations.
  *
@@ -425,20 +424,6 @@ dictEntry* replaceSatelliteDictKeyPtrAndOrDefragDictEntry(dict *d, sds oldkey, s
     return NULL;
 }
 
-bool replaceSatelliteOSetKeyPtr(expireset &set, sds oldkey, sds newkey) {
-    auto itr = set.find(oldkey);
-    if (itr != set.end())
-    {
-        expireEntry eNew(std::move(*itr));
-        eNew.setKeyUnsafe(newkey);
-        set.erase(itr);
-        set.insert(eNew);
-        serverAssert(set.find(newkey) != set.end());
-        return true;
-    }
-    return false;
-}
-
 long activeDefragQuickListNode(quicklist *ql, quicklistNode **node_ref) {
     quicklistNode *newnode, *node = *node_ref;
     long defragged = 0;
@@ -851,7 +836,6 @@ long defragModule(redisDb *db, dictEntry *kde) {
  * all the various pointers it has. Returns a stat of how many pointers were
  * moved. */
 long defragKey(redisDb *db, dictEntry *de) {
-    std::unique_lock<fastlock> ul(g_expireLock);
     sds keysds = (sds)dictGetKey(de);
     robj *newob, *ob;
     unsigned char *newzl;
@@ -862,15 +846,8 @@ long defragKey(redisDb *db, dictEntry *de) {
 
     /* Try to defrag the key name. */
     newsds = activeDefragSds(keysds);
-    if (newsds)
-    {
+    if (newsds) {
         defragged++, de->key = newsds;
-        if (!db->setexpire()->empty()) {
-            bool fReplaced = replaceSatelliteOSetKeyPtr(*const_cast<expireset*>(db->setexpire()), keysds, newsds);
-            serverAssert(fReplaced == ob->FExpires());
-        } else {
-            serverAssert(!ob->FExpires());
-        }
     }
 
     if ((newob = activeDefragStringOb(ob, &defragged))) {

src/evict.cpp

@@ -100,6 +100,36 @@ unsigned long long estimateObjectIdleTime(robj_roptr o) {
     }
 }
 
+unsigned long long getIdle(robj *obj, const expireEntry *e) {
+    unsigned long long idle;
+    /* Calculate the idle time according to the policy. This is called
+        * idle just because the code initially handled LRU, but is in fact
+        * just a score where an higher score means better candidate. */
+    if (g_pserver->maxmemory_policy & MAXMEMORY_FLAG_LRU) {
+        idle = (obj != nullptr) ? estimateObjectIdleTime(obj) : 0;
+    } else if (g_pserver->maxmemory_policy & MAXMEMORY_FLAG_LFU) {
+        /* When we use an LRU policy, we sort the keys by idle time
+            * so that we expire keys starting from greater idle time.
+            * However when the policy is an LFU one, we have a frequency
+            * estimation, and we want to evict keys with lower frequency
+            * first. So inside the pool we put objects using the inverted
+            * frequency subtracting the actual frequency to the maximum
+            * frequency of 255. */
+        idle = 255-LFUDecrAndReturn(obj);
+    } else if (g_pserver->maxmemory_policy == MAXMEMORY_VOLATILE_TTL) {
+        /* In this case the sooner the expire the better. */
+        if (e != nullptr)
+            idle = ULLONG_MAX - e->when();
+        else
+            idle = 0;
+    } else if (g_pserver->maxmemory_policy & MAXMEMORY_FLAG_ALLKEYS) {
+        idle = ULLONG_MAX;
+    } else {
+        serverPanic("Unknown eviction policy in storage eviction");
+    }
+    return idle;
+}
+
 /* LRU approximation algorithm
  *
  * Redis uses an approximation of the LRU algorithm that runs in constant
@@ -137,28 +167,7 @@ void evictionPoolAlloc(void) {
 
 void processEvictionCandidate(int dbid, sds key, robj *o, const expireEntry *e, struct evictionPoolEntry *pool)
 {
-    unsigned long long idle;
-
-    /* Calculate the idle time according to the policy. This is called
-        * idle just because the code initially handled LRU, but is in fact
-        * just a score where an higher score means better candidate. */
-    if (g_pserver->maxmemory_policy & MAXMEMORY_FLAG_LRU) {
-        idle = (o != nullptr) ? estimateObjectIdleTime(o) : 0;
-    } else if (g_pserver->maxmemory_policy & MAXMEMORY_FLAG_LFU) {
-        /* When we use an LRU policy, we sort the keys by idle time
-            * so that we expire keys starting from greater idle time.
-            * However when the policy is an LFU one, we have a frequency
-            * estimation, and we want to evict keys with lower frequency
-            * first. So inside the pool we put objects using the inverted
-            * frequency subtracting the actual frequency to the maximum
-            * frequency of 255. */
-        idle = 255-LFUDecrAndReturn(o);
-    } else if (g_pserver->maxmemory_policy == MAXMEMORY_VOLATILE_TTL) {
-        /* In this case the sooner the expire the better. */
-        idle = ULLONG_MAX - e->when();
-    } else {
-        serverPanic("Unknown eviction policy in evictionPoolPopulate()");
-    }
+    unsigned long long idle = getIdle(o,e);
 
     /* Insert the element inside the pool.
         * First, find the first empty bucket or the first populated
@@ -222,52 +231,23 @@ void processEvictionCandidate(int dbid, sds key, robj *o, const expireEntry *e,
  * idle time are on the left, and keys with the higher idle time on the
  * right. */
 
-struct visitFunctor
+int evictionPoolPopulate(int dbid, redisDb *db, bool fVolatile, struct evictionPoolEntry *pool)
 {
-    int dbid;
-    dict *dbdict;
-    struct evictionPoolEntry *pool;
-    int count = 0;
-    int tries = 0;
-
-    bool operator()(const expireEntry &e)
-    {
-        dictEntry *de = dictFind(dbdict, e.key());
-        if (de != nullptr)
+    int returnCount = 0;
+    dictEntry **samples = (dictEntry**)alloca(g_pserver->maxmemory_samples * sizeof(dictEntry*));
+    int count = dictGetSomeKeys(db->dictUnsafeKeyOnly(),samples,g_pserver->maxmemory_samples);
+    for (int j = 0; j < count; j++) {
+        robj *o = (robj*)dictGetVal(samples[j]);
+        // If the object is in second tier storage we don't need to evict it (since it already is)
+        if (o != nullptr)
         {
-            processEvictionCandidate(dbid, (sds)dictGetKey(de), (robj*)dictGetVal(de), &e, pool);
-            ++count;
-        }
-        ++tries;
-        return tries < g_pserver->maxmemory_samples;
-    }
-};
-int evictionPoolPopulate(int dbid, redisDb *db, expireset *setexpire, struct evictionPoolEntry *pool)
-{
-    if (setexpire != nullptr)
-    {
-        std::unique_lock<fastlock> ul(g_expireLock);
-        visitFunctor visitor { dbid, db->dictUnsafeKeyOnly(), pool, 0 };
-        setexpire->random_visit(visitor);
-        return visitor.count;
-    }
-    else
-    {
-        int returnCount = 0;
-        dictEntry **samples = (dictEntry**)alloca(g_pserver->maxmemory_samples * sizeof(dictEntry*));
-        int count = dictGetSomeKeys(db->dictUnsafeKeyOnly(),samples,g_pserver->maxmemory_samples);
-        for (int j = 0; j < count; j++) {
-            robj *o = (robj*)dictGetVal(samples[j]);
-            // If the object is in second tier storage we don't need to evict it (since it alrady is)
-            if (o != nullptr)
-            {
-                processEvictionCandidate(dbid, (sds)dictGetKey(samples[j]), o, nullptr, pool);
+            if (!fVolatile || o->FExpires()) {
+                processEvictionCandidate(dbid, (sds)dictGetKey(samples[j]), o, &o->expire, pool);
                 ++returnCount;
             }
         }
-        return returnCount;
     }
-    return 0;
+    return returnCount;
 }
 
 /* ----------------------------------------------------------------------------
@@ -411,8 +391,13 @@ size_t freeMemoryGetNotCountedMemory(void) {
  *              memory currently used. May be > 1 if we are over the memory
  *              limit.
  *              (Populated both for C_ERR and C_OK)
+ * 
+ *  'reason'    the reason why the memory limit was exceeded
+ *              EVICT_REASON_USER: reported user memory exceeded maxmemory
+ *              EVICT_REASON_SYS: available system memory under configurable threshold 
+ *              (Populated when C_ERR is returned)
  */
-int getMaxmemoryState(size_t *total, size_t *logical, size_t *tofree, float *level, bool fQuickCycle, bool fPreSnapshot) {
+int getMaxmemoryState(size_t *total, size_t *logical, size_t *tofree, float *level, EvictReason *reason, bool fQuickCycle, bool fPreSnapshot) {
     size_t mem_reported, mem_used, mem_tofree;
 
     /* Check if we are over the memory usage limit. If we are not, no need
@@ -421,10 +406,22 @@ int getMaxmemoryState(size_t *total, size_t *logical, size_t *tofree, float *lev
     if (total) *total = mem_reported;
     size_t maxmemory = g_pserver->maxmemory;
     if (fPreSnapshot)
-        maxmemory = static_cast<size_t>(maxmemory * 0.9);   // derate memory by 10% since we won't be able to free during snapshot
-    if (g_pserver->FRdbSaveInProgress())
+        maxmemory = static_cast<size_t>(maxmemory*0.9);   // derate memory by 10% since we won't be able to free during snapshot
+    if (g_pserver->FRdbSaveInProgress() && !cserver.fForkBgSave)
         maxmemory = static_cast<size_t>(maxmemory*1.2);
 
+    /* If available system memory is below a certain threshold, force eviction */
+    long long sys_available_mem_buffer = 0;
+    if (g_pserver->force_eviction_percent && g_pserver->cron_malloc_stats.sys_total) {
+        float available_mem_ratio = (float)(100 - g_pserver->force_eviction_percent)/100;
+        size_t min_available_mem = static_cast<size_t>(g_pserver->cron_malloc_stats.sys_total * available_mem_ratio);
+        sys_available_mem_buffer = static_cast<long>(g_pserver->cron_malloc_stats.sys_available - min_available_mem);
+        if (sys_available_mem_buffer < 0) {
+            long long mem_threshold = mem_reported + sys_available_mem_buffer;
+            maxmemory = ((long long)maxmemory < mem_threshold) ? maxmemory : static_cast<size_t>(mem_threshold);
+        }
+    }
+
     /* We may return ASAP if there is no need to compute the level. */
     int return_ok_asap = !maxmemory || mem_reported <= maxmemory;
     if (return_ok_asap && !level) return C_OK;
@@ -435,6 +432,12 @@ int getMaxmemoryState(size_t *total, size_t *logical, size_t *tofree, float *lev
     size_t overhead = freeMemoryGetNotCountedMemory();
     mem_used = (mem_used > overhead) ? mem_used-overhead : 0;
 
+     /* If system available memory is too low, we want to force evictions no matter
+     * what so we also offset the overhead from maxmemory. */
+    if (sys_available_mem_buffer < 0) {
+        maxmemory = (maxmemory > overhead) ? maxmemory-overhead : 0;
+    }
+
     /* Compute the ratio of memory usage. */
     if (level) {
         if (!maxmemory) {
@@ -459,6 +462,8 @@ int getMaxmemoryState(size_t *total, size_t *logical, size_t *tofree, float *lev
     if (logical) *logical = mem_used;
     if (tofree) *tofree = mem_tofree;
 
+    if (reason) *reason = sys_available_mem_buffer < 0 ? EvictReason::System : EvictReason::User;
+
     return C_ERR;
 }
 
@@ -483,6 +488,7 @@ public:
             for (auto de : pair.second) {
                 dictFreeUnlinkedEntry(pair.first, de);
             }
+            dictRelease(pair.first);
         }
         aeReleaseLock();
         --s_clazyFreesInProgress;
@@ -513,6 +519,7 @@ public:
         );
         if (itr == vecdictvecde.end() || itr->first != d) {
             itr = vecdictvecde.insert(itr, std::make_pair(d, std::vector<dictEntry*>()));
+            __atomic_fetch_add(&d->refcount, 1, __ATOMIC_ACQ_REL);
         }
         serverAssert(itr->first == d);
         itr->second.push_back(de);
@@ -602,6 +609,37 @@ static unsigned long evictionTimeLimitUs() {
     return ULONG_MAX;   /* No limit to eviction time */
 }
 
+void evict(redisDb *db, robj *keyobj) {
+    mstime_t eviction_latency;
+    propagateExpire(db,keyobj,g_pserver->lazyfree_lazy_eviction);
+    /* We compute the amount of memory freed by db*Delete() alone.
+    * It is possible that actually the memory needed to propagate
+    * the DEL in AOF and replication link is greater than the one
+    * we are freeing removing the key, but we can't account for
+    * that otherwise we would never exit the loop.
+    *
+    * AOF and Output buffer memory will be freed eventually so
+    * we only care about memory used by the key space. */
+    latencyStartMonitor(eviction_latency);
+    if (g_pserver->lazyfree_lazy_eviction)
+        dbAsyncDelete(db,keyobj);
+    else
+        dbSyncDelete(db,keyobj);
+    latencyEndMonitor(eviction_latency);
+    latencyAddSampleIfNeeded("eviction-del",eviction_latency);
+
+    signalModifiedKey(NULL,db,keyobj);
+    notifyKeyspaceEvent(NOTIFY_EVICTED, "evicted",
+        keyobj, db->id);
+    decrRefCount(keyobj);
+}
+
+static void updateSysAvailableMemory() {
+    if (g_pserver->force_eviction_percent) {
+        g_pserver->cron_malloc_stats.sys_available = getMemAvailable();
+    }
+}
+
 /* Check that memory usage is within the current "maxmemory" limit.  If over
  * "maxmemory", attempt to free memory by evicting data (if it's safe to do so).
  *
@@ -633,16 +671,17 @@ int performEvictions(bool fPreSnapshot) {
     int keys_freed = 0;
     size_t mem_reported, mem_tofree;
     long long mem_freed; /* May be negative */
-    mstime_t latency, eviction_latency;
+    mstime_t latency;
     long long delta;
     int slaves = listLength(g_pserver->slaves);
     const bool fEvictToStorage = !cserver.delete_on_evict && g_pserver->db[0]->FStorageProvider();
     int result = EVICT_FAIL;
     int ckeysFailed = 0;
+    EvictReason evictReason;
 
     std::unique_ptr<FreeMemoryLazyFree> splazy = std::make_unique<FreeMemoryLazyFree>();
 
-    if (getMaxmemoryState(&mem_reported,NULL,&mem_tofree,NULL,false,fPreSnapshot) == C_OK)
+    if (getMaxmemoryState(&mem_reported,NULL,&mem_tofree,NULL,&evictReason,false,fPreSnapshot) == C_OK)
         return EVICT_OK;
 
     if (g_pserver->maxmemory_policy == MAXMEMORY_NO_EVICTION)
@@ -657,6 +696,43 @@ int performEvictions(bool fPreSnapshot) {
     monotime evictionTimer;
     elapsedStart(&evictionTimer);
 
+    if (g_pserver->maxstorage && g_pserver->m_pstorageFactory != nullptr) {
+        while (g_pserver->m_pstorageFactory->totalDiskspaceUsed() >= g_pserver->maxstorage && elapsedUs(evictionTimer) < eviction_time_limit_us) {
+            redisDb *db;
+            std::vector<std::string> evictionPool;
+            robj *bestkey = nullptr;
+            redisDb *bestdb = nullptr;
+            unsigned long long bestidle = 0;
+            for (int i = 0; i < cserver.dbnum; i++) {
+                db = g_pserver->db[i];
+                evictionPool = db->getStorageCache()->getEvictionCandidates(g_pserver->maxmemory_samples);
+                for (std::string key : evictionPool) {
+                    robj *keyobj = createStringObject(key.c_str(), key.size());
+                    robj *obj = db->find(szFromObj(keyobj));
+                    if (obj != nullptr) {
+                        expireEntry *e = db->getExpire(keyobj);
+                        unsigned long long idle = getIdle(obj, e);
+
+                        if (bestkey == nullptr || bestidle < idle) {
+                            if (bestkey != nullptr)
+                                decrRefCount(bestkey);
+                            incrRefCount(keyobj);
+                            bestkey = keyobj;
+                            bestidle = idle;
+                            bestdb = db;
+                        }
+                    }
+                    decrRefCount(keyobj);
+                }
+            }
+            if (bestkey) {
+                evict(bestdb, bestkey);
+            } else {
+                break; //could not find a key to evict so stop now
+            }
+        }
+    }
+
     if (g_pserver->maxstorage && g_pserver->m_pstorageFactory != nullptr && g_pserver->m_pstorageFactory->totalDiskspaceUsed() >= g_pserver->maxstorage)
         goto cant_free_storage;
 
@@ -684,14 +760,14 @@ int performEvictions(bool fPreSnapshot) {
                     if (g_pserver->maxmemory_policy & MAXMEMORY_FLAG_ALLKEYS)
                     {
                         if ((keys = db->size()) != 0) {
-                            total_keys += evictionPoolPopulate(i, db, nullptr, pool);
+                            total_keys += evictionPoolPopulate(i, db, false, pool);
                         }
                     }
                     else
                     {
                         keys = db->expireSize();
                         if (keys != 0)
-                            total_keys += evictionPoolPopulate(i, db, db->setexpireUnsafe(), pool);
+                            total_keys += evictionPoolPopulate(i, db, true, pool);
                     }
                 }
                 if (!total_keys) break; /* No keys to evict. */
@@ -752,7 +828,7 @@ int performEvictions(bool fPreSnapshot) {
                 {
                     if (db->expireSize())
                     {
-                        bestkey = (sds)db->random_expire().key();
+                        db->random_expire(&bestkey);
                         bestdbid = j;
                         break;
                     }
@@ -771,7 +847,7 @@ int performEvictions(bool fPreSnapshot) {
                 if (db->removeCachedValue(bestkey, &deT)) {
                     mem_freed += splazy->addEntry(db->dictUnsafeKeyOnly(), deT);
                     ckeysFailed = 0;
-		    g_pserver->stat_evictedkeys++;
+                    g_pserver->stat_evictedkeys++;
                 }
                 else {
                     delta = 0;
@@ -783,30 +859,11 @@ int performEvictions(bool fPreSnapshot) {
             else
             {
                 robj *keyobj = createStringObject(bestkey,sdslen(bestkey));
-                propagateExpire(db,keyobj,g_pserver->lazyfree_lazy_eviction);
-                /* We compute the amount of memory freed by db*Delete() alone.
-                * It is possible that actually the memory needed to propagate
-                * the DEL in AOF and replication link is greater than the one
-                * we are freeing removing the key, but we can't account for
-                * that otherwise we would never exit the loop.
-                *
-                * AOF and Output buffer memory will be freed eventually so
-                * we only care about memory used by the key space. */
                 delta = (long long) zmalloc_used_memory();
-                latencyStartMonitor(eviction_latency);
-                if (g_pserver->lazyfree_lazy_eviction)
-                    dbAsyncDelete(db,keyobj);
-                else
-                    dbSyncDelete(db,keyobj);
-                latencyEndMonitor(eviction_latency);
-                latencyAddSampleIfNeeded("eviction-del",eviction_latency);
+                evict(db, keyobj);
                 delta -= (long long) zmalloc_used_memory();
                 mem_freed += delta;
                 g_pserver->stat_evictedkeys++;
-                signalModifiedKey(NULL,db,keyobj);
-                notifyKeyspaceEvent(NOTIFY_EVICTED, "evicted",
-                    keyobj, db->id);
-                decrRefCount(keyobj);
             }
             keys_freed++;
 
@@ -825,6 +882,9 @@ int performEvictions(bool fPreSnapshot) {
                  * across the dbAsyncDelete() call, while the thread can
                  * release the memory all the time. */
                 if (g_pserver->lazyfree_lazy_eviction) {
+                    if (evictReason == EvictReason::System) {
+                        updateSysAvailableMemory();
+                    }
                     if (getMaxmemoryState(NULL,NULL,NULL,NULL) == C_OK) {
                         break;
                     }
@@ -852,9 +912,13 @@ int performEvictions(bool fPreSnapshot) {
 
     if (splazy != nullptr && splazy->memory_queued() > 0 && !serverTL->gcEpoch.isReset()) {
         g_pserver->garbageCollector.enqueue(serverTL->gcEpoch, std::move(splazy));
-    }
+    } 
 
 cant_free:
+    if (mem_freed > 0 && evictReason == EvictReason::System) {
+        updateSysAvailableMemory();
+    }
+
     if (g_pserver->m_pstorageFactory)
     {
         if (mem_reported < g_pserver->maxmemory*1.2) {

src/expire.cpp

@@ -33,8 +33,6 @@
 #include "server.h"
 #include "cron.h"
 
-fastlock g_expireLock {"Expire"};
-
 /* Helper function for the activeExpireCycle() function.
  * This function will try to expire the key that is stored in the hash table
  * entry 'de' of the 'expires' hash table of a Redis database.
@@ -74,21 +72,20 @@ void activeExpireCycleExpireFullKey(redisDb *db, const char *key) {
  *----------------------------------------------------------------------------*/
 
 
-int activeExpireCycleExpire(redisDb *db, expireEntry &e, long long now, size_t &tried) {
+int activeExpireCycleExpire(redisDb *db, const char *key, expireEntry &e, long long now, size_t &tried) {
     if (!e.FFat())
     {
-        activeExpireCycleExpireFullKey(db, e.key());
+        activeExpireCycleExpireFullKey(db, key);
         ++tried;
         return 1;
     }
 
     expireEntryFat *pfat = e.pfatentry();
-    robj *val = db->find(e.key());
+    robj *val = db->find(key);
     int deleted = 0;
 
     redisObjectStack objKey;
-    initStaticStringObject(objKey, (char*)e.key());
-    bool fTtlChanged = false;
+    initStaticStringObject(objKey, (char*)key);
 
     while (!pfat->FEmpty())
     {
@@ -99,7 +96,7 @@ int activeExpireCycleExpire(redisDb *db, expireEntry &e, long long now, size_t &
         // Is it the full key expiration?
         if (pfat->nextExpireEntry().spsubkey == nullptr)
         {
-            activeExpireCycleExpireFullKey(db, e.key());
+            activeExpireCycleExpireFullKey(db, key);
             return ++deleted;
         }
 
@@ -109,7 +106,7 @@ int activeExpireCycleExpire(redisDb *db, expireEntry &e, long long now, size_t &
             if (setTypeRemove(val,pfat->nextExpireEntry().spsubkey.get())) {
                 deleted++;
                 if (setTypeSize(val) == 0) {
-                    activeExpireCycleExpireFullKey(db, e.key());
+                    activeExpireCycleExpireFullKey(db, key);
                     return deleted;
                 }
             }
@@ -119,7 +116,7 @@ int activeExpireCycleExpire(redisDb *db, expireEntry &e, long long now, size_t &
             if (hashTypeDelete(val,(sds)pfat->nextExpireEntry().spsubkey.get())) {
                 deleted++;
                 if (hashTypeLength(val) == 0) {
-                    activeExpireCycleExpireFullKey(db, e.key());
+                    activeExpireCycleExpireFullKey(db, key);
                     return deleted;
                 }
             }
@@ -129,7 +126,7 @@ int activeExpireCycleExpire(redisDb *db, expireEntry &e, long long now, size_t &
             if (zsetDel(val,(sds)pfat->nextExpireEntry().spsubkey.get())) {
                 deleted++;
                 if (zsetLength(val) == 0) {
-                    activeExpireCycleExpireFullKey(db, e.key());
+                    activeExpireCycleExpireFullKey(db, key);
                     return deleted;
                 }
             }
@@ -137,15 +134,15 @@ int activeExpireCycleExpire(redisDb *db, expireEntry &e, long long now, size_t &
 
         case OBJ_CRON:
         {
-            sds keyCopy = sdsdup(e.key());
+            sds keyCopy = sdsdup(key);
             incrRefCount(val);
             aePostFunction(g_pserver->rgthreadvar[IDX_EVENT_LOOP_MAIN].el, [keyCopy, val]{
                 executeCronJobExpireHook(keyCopy, val);
                 sdsfree(keyCopy);
                 decrRefCount(val);
             }, true /*fLock*/, true /*fForceQueue*/);
+            break;
         }
-            return deleted;
 
         case OBJ_LIST:
         default:
@@ -157,7 +154,6 @@ int activeExpireCycleExpire(redisDb *db, expireEntry &e, long long now, size_t &
         propagateSubkeyExpire(db, val->type, &objKey, &objSubkey);
         
         pfat->popfrontExpireEntry();
-        fTtlChanged = true;
         if ((tried % ACTIVE_EXPIRE_CYCLE_SUBKEY_LOOKUPS_PER_LOOP) == 0) {
             break;
         }
@@ -167,11 +163,6 @@ int activeExpireCycleExpire(redisDb *db, expireEntry &e, long long now, size_t &
     {
         removeExpire(db, &objKey);
     }
-    else if (!pfat->FEmpty() && fTtlChanged)
-    {
-        // We need to resort the expire entry since it may no longer be in the correct position
-        db->resortExpire(e);
-    }
 
     if (deleted)
     {
@@ -317,8 +308,26 @@ void pexpireMemberAtCommand(client *c)
  * If type is ACTIVE_EXPIRE_CYCLE_SLOW, that normal expire cycle is
  * executed, where the time limit is a percentage of the REDIS_HZ period
  * as specified by the ACTIVE_EXPIRE_CYCLE_SLOW_TIME_PERC define. */
+#define ACTIVE_EXPIRE_CYCLE_KEYS_PER_LOOP 20 /* Keys for each DB loop. */
+#define ACTIVE_EXPIRE_CYCLE_FAST_DURATION 1000 /* Microseconds. */
+#define ACTIVE_EXPIRE_CYCLE_SLOW_TIME_PERC 25 /* Max % of CPU to use. */
+#define ACTIVE_EXPIRE_CYCLE_ACCEPTABLE_STALE 10 /* % of stale keys after which
+                                                   we do extra efforts. */
+/*static*/ void redisDbPersistentData::activeExpireCycleCore(int type) {
+    /* Adjust the running parameters according to the configured expire
+     * effort. The default effort is 1, and the maximum configurable effort
+     * is 10. */
+    unsigned long
+    effort = g_pserver->active_expire_effort-1, /* Rescale from 0 to 9. */
+    config_keys_per_loop = ACTIVE_EXPIRE_CYCLE_KEYS_PER_LOOP +
+                           ACTIVE_EXPIRE_CYCLE_KEYS_PER_LOOP/4*effort,
+    config_cycle_fast_duration = ACTIVE_EXPIRE_CYCLE_FAST_DURATION +
+                                 ACTIVE_EXPIRE_CYCLE_FAST_DURATION/4*effort,
+    config_cycle_slow_time_perc = ACTIVE_EXPIRE_CYCLE_SLOW_TIME_PERC +
+                                  2*effort,
+    config_cycle_acceptable_stale = ACTIVE_EXPIRE_CYCLE_ACCEPTABLE_STALE-
+                                    effort;
 
-void activeExpireCycleCore(int type) {
     /* This function has some global state in order to continue the work
      * incrementally across calls. */
     static unsigned int current_db = 0; /* Next DB to test. */
@@ -336,10 +345,16 @@ void activeExpireCycleCore(int type) {
 
     if (type == ACTIVE_EXPIRE_CYCLE_FAST) {
         /* Don't start a fast cycle if the previous cycle did not exit
-         * for time limit. Also don't repeat a fast cycle for the same period
+         * for time limit, unless the percentage of estimated stale keys is
+         * too high. Also never repeat a fast cycle for the same period
          * as the fast cycle total duration itself. */
-        if (!timelimit_exit) return;
-        if (start < last_fast_cycle + ACTIVE_EXPIRE_CYCLE_FAST_DURATION*2) return;
+        if (!timelimit_exit &&
+            g_pserver->stat_expired_stale_perc < config_cycle_acceptable_stale)
+            return;
+
+        if (start < last_fast_cycle + (long long)config_cycle_fast_duration*2)
+            return;
+
         last_fast_cycle = start;
     }
 
@@ -353,16 +368,16 @@ void activeExpireCycleCore(int type) {
     if (dbs_per_call > cserver.dbnum || timelimit_exit)
         dbs_per_call = cserver.dbnum;
 
-    /* We can use at max ACTIVE_EXPIRE_CYCLE_SLOW_TIME_PERC percentage of CPU time
-     * per iteration. Since this function gets called with a frequency of
-     * g_pserver->hz times per second, the following is the max amount of
+    /* We can use at max 'config_cycle_slow_time_perc' percentage of CPU
+     * time per iteration. Since this function gets called with a frequency of
+     * server.hz times per second, the following is the max amount of
      * microseconds we can spend in this function. */
-    timelimit = 1000000*ACTIVE_EXPIRE_CYCLE_SLOW_TIME_PERC/g_pserver->hz/100;
+    timelimit = config_cycle_slow_time_perc*1000000/g_pserver->hz/100;
     timelimit_exit = 0;
     if (timelimit <= 0) timelimit = 1;
 
     if (type == ACTIVE_EXPIRE_CYCLE_FAST)
-        timelimit = ACTIVE_EXPIRE_CYCLE_FAST_DURATION; /* in microseconds. */
+        timelimit = config_cycle_fast_duration; /* in microseconds. */
 
     /* Accumulate some global stats as we expire keys, to have some idea
      * about the number of keys that are already logically expired, but still
@@ -371,6 +386,9 @@ void activeExpireCycleCore(int type) {
     long total_expired = 0;
 
     for (j = 0; j < dbs_per_call && timelimit_exit == 0; j++) {
+        /* Expired and checked in a single loop. */
+        unsigned long expired, sampled;
+
         redisDb *db = g_pserver->db[(current_db % cserver.dbnum)];
 
         /* Increment the DB now so we are sure if we run out of time
@@ -378,48 +396,156 @@ void activeExpireCycleCore(int type) {
          * distribute the time evenly across DBs. */
         current_db++;
 
-        long long now;
-        iteration++;
-        now = mstime();
+        if (g_pserver->m_pstorageFactory == nullptr) {
+            /* Continue to expire if at the end of the cycle there are still
+            * a big percentage of keys to expire, compared to the number of keys
+            * we scanned. The percentage, stored in config_cycle_acceptable_stale
+            * is not fixed, but depends on the Redis configured "expire effort". */
+            do {
+                unsigned long num, slots;
+                long long now, ttl_sum;
+                int ttl_samples;
+                iteration++;
 
-        /* If there is nothing to expire try next DB ASAP. */
-        if (db->setexpireUnsafe()->empty())
-        {
-            db->avg_ttl = 0;
-            db->last_expire_set = now;
-            continue;
-        }
-        
-        std::unique_lock<fastlock> ul(g_expireLock);
-        size_t expired = 0;
-        size_t tried = 0;
-        long long check = ACTIVE_EXPIRE_CYCLE_FAST_DURATION;    // assume a check is roughly 1us.  It isn't but good enough
-        db->expireitr = db->setexpireUnsafe()->enumerate(db->expireitr, now, [&](expireEntry &e) __attribute__((always_inline)) {
-            if (e.when() < now)
-            {
-                expired += activeExpireCycleExpire(db, e, now, tried);
-            }
+                /* If there is nothing to expire try next DB ASAP. */
+                if (db->expireSize() == 0) {
+                    db->avg_ttl = 0;
+                    break;
+                }
+                num = dictSize(db->m_pdict);
+                slots = dictSlots(db->m_pdict);
+                now = mstime();
+
+                /* When there are less than 1% filled slots, sampling the key
+                * space is expensive, so stop here waiting for better times...
+                * The dictionary will be resized asap. */
+                if (slots > DICT_HT_INITIAL_SIZE &&
+                    (num*100/slots < 1)) break;
+
+                /* The main collection cycle. Sample random keys among keys
+                * with an expire set, checking for expired ones. */
+                expired = 0;
+                sampled = 0;
+                ttl_sum = 0;
+                ttl_samples = 0;
+
+                if (num > config_keys_per_loop)
+                    num = config_keys_per_loop;
+
+                /* Here we access the low level representation of the hash table
+                * for speed concerns: this makes this code coupled with dict.c,
+                * but it hardly changed in ten years.
+                *
+                * Note that certain places of the hash table may be empty,
+                * so we want also a stop condition about the number of
+                * buckets that we scanned. However scanning for free buckets
+                * is very fast: we are in the cache line scanning a sequential
+                * array of NULL pointers, so we can scan a lot more buckets
+                * than keys in the same time. */
+                long max_buckets = num*20;
+                long checked_buckets = 0;
+
+                while (sampled < num && checked_buckets < max_buckets) {
+                    for (int table = 0; table < 2; table++) {
+                        if (table == 1 && !dictIsRehashing(db->m_pdict)) break;
+
+                        unsigned long idx = db->expires_cursor;
+                        idx &= db->m_pdict->ht[table].sizemask;
+                        dictEntry *de = db->m_pdict->ht[table].table[idx];
+                        long long ttl;
+
+                        /* Scan the current bucket of the current table. */
+                        checked_buckets++;
+                        while(de) {
+                            /* Get the next entry now since this entry may get
+                            * deleted. */
+                            dictEntry *e = de;
+                            robj *o = (robj*)dictGetVal(de);
+                            de = de->next;
+                            if (!o->FExpires())
+                                continue;
+
+                            expireEntry *exp = &o->expire;
+
+                            serverAssert(exp->when() > 0);
+                            ttl = exp->when()-now;
+                            size_t tried = 0;
+                            if (exp->when() <= now) {
+                                if (activeExpireCycleExpire(db,(const char*)dictGetKey(e),*exp,now,tried)) expired++;
+                                serverAssert(ttl <= 0);
+                            } else {
+                                serverAssert(ttl > 0);
+                            }
+                            if (ttl > 0) {
+                                /* We want the average TTL of keys yet
+                                * not expired. */
+                                ttl_sum += ttl;
+                                ttl_samples++;
+                            }
+                            sampled++;
+                        }
+                    }
+                    db->expires_cursor++;
+                }
+                total_expired += expired;
+                total_sampled += sampled;
+
+                /* Update the average TTL stats for this database. */
+                if (ttl_samples) {
+                    long long avg_ttl = ttl_sum/ttl_samples;
+
+                    /* Do a simple running average with a few samples.
+                    * We just use the current estimate with a weight of 2%
+                    * and the previous estimate with a weight of 98%. */
+                    if (db->avg_ttl == 0) db->avg_ttl = avg_ttl;
+                    db->avg_ttl = (db->avg_ttl/50)*49 + (avg_ttl/50);
+                }
 
-            if ((tried % ACTIVE_EXPIRE_CYCLE_LOOKUPS_PER_LOOP) == 0)
-            {
                 /* We can't block forever here even if there are many keys to
                 * expire. So after a given amount of milliseconds return to the
                 * caller waiting for the other active expire cycle. */
-                elapsed = ustime()-start;
-                if (elapsed > timelimit) {
-                    timelimit_exit = 1;
-                    g_pserver->stat_expired_time_cap_reached_count++;
-                    return false;
+                if ((iteration & 0xf) == 0) { /* check once every 16 iterations. */
+                    elapsed = ustime()-start;
+                    if (elapsed > timelimit) {
+                        timelimit_exit = 1;
+                        g_pserver->stat_expired_time_cap_reached_count++;
+                        break;
+                    }
                 }
-                check = ACTIVE_EXPIRE_CYCLE_FAST_DURATION;
-            }
-            return true;
-        }, &check);
+                /* We don't repeat the cycle for the current database if there are
+                * an acceptable amount of stale keys (logically expired but yet
+                * not reclaimed). */
+            } while (sampled == 0 ||
+                    (expired*100/sampled) > config_cycle_acceptable_stale);
+        } else {
+            long prev_expired;
+            long long now = mstime();
+            size_t tried = 0;
+            std::vector<std::string> keys;
+            do {
+                prev_expired = total_expired;
+                keys = db->getStorageCache()->getExpirationCandidates(ACTIVE_EXPIRE_CYCLE_LOOKUPS_PER_LOOP);
+                for (std::string key : keys) {
+                    robj* keyobj = createStringObject(key.c_str(), key.size());
+                    db->find(szFromObj(keyobj));
+                    expireEntry *e = db->getExpire(keyobj);
+                    if (e != nullptr && e->when() < now)
+                        total_expired += activeExpireCycleExpire(db, szFromObj(keyobj), *e, now, tried);
+                    decrRefCount(keyobj);
+                }
+                total_sampled += keys.size();
+                elapsed = ustime()-start;
+            } while (keys.size() > 0 && (elapsed < timelimit) && (total_expired - prev_expired) > 0);
 
-        total_expired += expired;
+            if (ustime()-start > timelimit) {
+                timelimit_exit = 1;
+                g_pserver->stat_expired_time_cap_reached_count++;
+            }
+        }
     }
 
     elapsed = ustime()-start;
+    g_pserver->stat_expire_cycle_time_used += elapsed;
     latencyAddSampleIfNeeded("expire-cycle",elapsed/1000);
 
     /* Update our estimate of keys existing but yet to be expired.
@@ -435,7 +561,7 @@ void activeExpireCycleCore(int type) {
 
 void activeExpireCycle(int type)
 {
-    runAndPropogateToReplicas(activeExpireCycleCore, type);
+    runAndPropogateToReplicas(redisDbPersistentData::activeExpireCycleCore, type);
 }
 
 /*-----------------------------------------------------------------------------
@@ -481,7 +607,6 @@ void expireSlaveKeys(void) {
     if (slaveKeysWithExpire == NULL ||
         dictSize(slaveKeysWithExpire) == 0) return;
 
-    std::unique_lock<fastlock> ul(g_expireLock);
     int cycles = 0, noexpire = 0;
     mstime_t start = mstime();
     while(1) {
@@ -496,19 +621,14 @@ void expireSlaveKeys(void) {
         while(dbids && dbid < cserver.dbnum) {
             if ((dbids & 1) != 0) {
                 redisDb *db = g_pserver->db[dbid];
-
-                // the expire is hashed based on the key pointer, so we need the point in the main db
                 auto itrDB = db->find(keyname);
-                auto itrExpire = db->setexpire()->end();
-                if (itrDB != nullptr)
-                    itrExpire = db->setexpireUnsafe()->find(itrDB.key());
                 int expired = 0;
 
-                if (itrExpire != db->setexpire()->end())
+                if (itrDB != db->end() && itrDB->FExpires())
                 {
-                    if (itrExpire->when() < start) {
+                    if (itrDB->expire.when() < start) {
                         size_t tried = 0;
-                        expired = activeExpireCycleExpire(g_pserver->db[dbid],*itrExpire,start,tried);
+                        expired = activeExpireCycleExpire(g_pserver->db[dbid],itrDB.key(),itrDB->expire,start,tried);
                     }
                 }
 
@@ -516,7 +636,7 @@ void expireSlaveKeys(void) {
                  * corresponding bit in the new bitmap we set as value.
                  * At the end of the loop if the bitmap is zero, it means we
                  * no longer need to keep track of this key. */
-                if (itrExpire != db->setexpire()->end() && !expired) {
+                if (itrDB != db->end() && itrDB->FExpires() && !expired) {
                     noexpire++;
                     new_dbids |= (uint64_t)1 << dbid;
                 }
@@ -694,7 +814,6 @@ void ttlGenericCommand(client *c, int output_ms) {
 
     /* The key exists. Return -1 if it has no expire, or the actual
         * TTL value otherwise. */
-    std::unique_lock<fastlock> ul(g_expireLock);
     expireEntry *pexpire = c->db->getExpire(c->argv[1]);
 
     if (c->argc == 2) {
@@ -784,18 +903,11 @@ expireEntryFat::~expireEntryFat()
 }
 
 expireEntryFat::expireEntryFat(const expireEntryFat &e)
-    : m_keyPrimary(e.m_keyPrimary), m_vecexpireEntries(e.m_vecexpireEntries)
+    : m_vecexpireEntries(e.m_vecexpireEntries)
 {
     // Note: dictExpires is not copied
 }
 
-expireEntryFat::expireEntryFat(expireEntryFat &&e)
-    : m_keyPrimary(std::move(e.m_keyPrimary)), m_vecexpireEntries(std::move(e.m_vecexpireEntries))
-{
-    m_dictIndex = e.m_dictIndex;
-    e.m_dictIndex = nullptr;
-}
-
 void expireEntryFat::createIndex()
 {
     serverAssert(m_dictIndex == nullptr);

src/expire.h

@@ -22,9 +22,11 @@ public:
         {}
 
         subexpireEntry(const subexpireEntry &other)
-            : spsubkey((const char*)sdsdupshared(other.spsubkey.get()), sdsfree)
+            : spsubkey(nullptr, sdsfree)
         {
             when = other.when;
+            if (other.spsubkey != nullptr)
+                spsubkey = std::unique_ptr<const char, void(*)(const char*)>((const char*)sdsdupshared(other.spsubkey.get()), sdsfree);
         }
 
         subexpireEntry(subexpireEntry &&) = default;
@@ -41,27 +43,30 @@ public:
     };
 
 private:
-    sdsimmutablestring m_keyPrimary;
     std::vector<subexpireEntry> m_vecexpireEntries;  // Note a NULL for the sds portion means the expire is for the primary key
     dict *m_dictIndex = nullptr;
+    long long m_whenPrimary = LLONG_MAX;
 
     void createIndex();
 public:
-    expireEntryFat(const sdsimmutablestring &keyPrimary)
-        : m_keyPrimary(keyPrimary)
-        {}
+    expireEntryFat() = default;
+    expireEntryFat(const expireEntryFat &);
     ~expireEntryFat();
 
-    expireEntryFat(const expireEntryFat &e);
-    expireEntryFat(expireEntryFat &&e);
-
     long long when() const noexcept { return m_vecexpireEntries.front().when; }
-    const char *key() const noexcept { return static_cast<const char*>(m_keyPrimary); }
 
     bool operator<(long long when) const noexcept { return this->when() <  when; }
 
     void expireSubKey(const char *szSubkey, long long when);
 
+    bool FGetPrimaryExpire(long long *pwhen) const {
+        if (m_whenPrimary != LLONG_MAX) {
+            *pwhen = m_whenPrimary;
+            return true;
+        }
+        return false;
+    }
+
     bool FEmpty() const noexcept { return m_vecexpireEntries.empty(); }
     const subexpireEntry &nextExpireEntry() const noexcept { return m_vecexpireEntries.front(); }
     void popfrontExpireEntry();
@@ -70,19 +75,11 @@ public:
 };
 
 class expireEntry {
-    struct
-    {
-        sdsimmutablestring m_key;
-        expireEntryFat *m_pfatentry = nullptr;
-    } u;
-    long long m_when;   // bit wise and with FFatMask means this is a fat entry and we should use the pointer
-
-    /* Mask to check if an entry is Fat, most significant bit of m_when being set means it is Fat otherwise it is not */
-    long long FFatMask() const noexcept {
-        return (1LL) << (sizeof(long long)*CHAR_BIT - 1);
-    }
-
-    expireEntry() = default;
+    struct {
+        uint64_t m_whenAndPtrUnion : 63,
+                fFat : 1;
+    } s;
+    static_assert(sizeof(expireEntryFat*) <= sizeof(int64_t), "The pointer must fit in the union");
 public:
     class iter
     {
@@ -118,92 +115,107 @@ public:
         const iter &operator*() const { return *this; }
     };
 
-    expireEntry(sds key, const char *subkey, long long when)
+    expireEntry() 
+    {
+        s.fFat = 0;
+        s.m_whenAndPtrUnion = 0;
+    }
+
+    expireEntry(const char *subkey, long long when)
     {
         if (subkey != nullptr)
         {
-            m_when = FFatMask() | INVALID_EXPIRE;
-            u.m_pfatentry = new (MALLOC_LOCAL) expireEntryFat(sdsimmutablestring(sdsdupshared(key)));
-            u.m_pfatentry->expireSubKey(subkey, when);
+            auto pfatentry = new (MALLOC_LOCAL) expireEntryFat();
+            pfatentry->expireSubKey(subkey, when);
+            s.m_whenAndPtrUnion = reinterpret_cast<long long>(pfatentry);
+            s.fFat = true;
         }
         else
         {
-            u.m_key = sdsimmutablestring(sdsdupshared(key));
-            m_when = when;
+            s.m_whenAndPtrUnion = when;
+            s.fFat = false;
         }
     }
 
-    expireEntry(const expireEntry &e)
-    {
-        *this = e;
-    }
-    expireEntry(expireEntry &&e)
-    {
-        u.m_key = std::move(e.u.m_key);
-        u.m_pfatentry = std::move(e.u.m_pfatentry);
-        m_when = e.m_when;
-        e.m_when = 0;
-        e.u.m_pfatentry = nullptr;
-    }
-
     expireEntry(expireEntryFat *pfatentry)
     {
-        u.m_pfatentry = pfatentry;
-        m_when = FFatMask() | INVALID_EXPIRE;
-        for (auto itr : *this)
-        {
-            if (itr.subkey() == nullptr)
-            {
-                m_when = FFatMask() | itr.when();
-                break;
-            }
+        assert(pfatentry != nullptr);
+        s.m_whenAndPtrUnion = reinterpret_cast<long long>(pfatentry);
+        s.fFat = true;
+    }
+
+    expireEntry(const expireEntry &e) {
+        if (e.FFat()) {
+            s.m_whenAndPtrUnion = reinterpret_cast<long long>(new expireEntryFat(*e.pfatentry()));
+            s.fFat = true;
+        } else {
+            s = e.s;
         }
     }
 
+    expireEntry(expireEntry &&e)
+    {
+        s = e.s;
+    }
+
+    expireEntry &operator=(expireEntry &&e)
+    {
+        if (FFat())
+            delete pfatentry();
+        s = e.s;
+        e.s.m_whenAndPtrUnion = 0;
+        e.s.fFat = false;
+        return *this;
+    }
+
+    expireEntry &operator=(expireEntry &e) {
+        if (FFat())
+            delete pfatentry();
+        if (e.FFat()) {
+            s.m_whenAndPtrUnion = reinterpret_cast<long long>(new expireEntryFat(*e.pfatentry()));
+            s.fFat = true;
+        } else {
+            s = e.s;
+        }
+        return *this;
+    }
+
     // Duplicate the expire, note this is intended to be passed directly to setExpire
     expireEntry duplicate() const {
         expireEntry dst;
-        dst.m_when = m_when;
         if (FFat()) {
-            dst.u.m_pfatentry = new expireEntryFat(*u.m_pfatentry);
+            auto pfatentry = new expireEntryFat(*expireEntry::pfatentry());
+            dst.s.m_whenAndPtrUnion = reinterpret_cast<long long>(pfatentry);
+            dst.s.fFat = true;
         } else {
-            dst.u.m_key = u.m_key;
+            dst.s.m_whenAndPtrUnion = s.m_whenAndPtrUnion;
+            dst.s.fFat = false;
         }
         return dst;
     }
 
+    void reset() {
+        if (FFat())
+            delete pfatentry();
+        s.fFat = false;
+        s.m_whenAndPtrUnion = 0;
+    }
+
     ~expireEntry()
     {
         if (FFat())
-            delete u.m_pfatentry;
+            delete pfatentry();
     }
 
-    expireEntry &operator=(const expireEntry &e)
-    {
-        u.m_key = e.u.m_key;
-        m_when = e.m_when;
-        if (e.FFat())
-            u.m_pfatentry = new (MALLOC_LOCAL) expireEntryFat(*e.u.m_pfatentry);
-        return *this;
+    inline bool FFat() const noexcept { return s.fFat; }
+    expireEntryFat *pfatentry() { 
+        assert(FFat()); 
+        return reinterpret_cast<expireEntryFat*>(s.m_whenAndPtrUnion);
+    }
+    const expireEntryFat *pfatentry() const { 
+        return const_cast<expireEntry*>(this)->pfatentry();
     }
 
-    void setKeyUnsafe(sds key)
-    {
-        if (FFat())
-            u.m_pfatentry->m_keyPrimary = sdsimmutablestring(sdsdupshared(key));
-        else
-            u.m_key = sdsimmutablestring(sdsdupshared(key));
-    }
-
-    inline bool FFat() const noexcept { return m_when & FFatMask(); }
-    expireEntryFat *pfatentry() { assert(FFat()); return u.m_pfatentry; }
-    const expireEntryFat *pfatentry() const { assert(FFat()); return u.m_pfatentry; }
-
-
-    bool operator==(const sdsview &key) const noexcept
-    { 
-        return key == this->key(); 
-    }
 
     bool operator<(const expireEntry &e) const noexcept
     { 
@@ -214,17 +226,11 @@ public:
         return this->when() < when;
     }
 
-    const char *key() const noexcept
-    { 
-        if (FFat())
-            return u.m_pfatentry->key();
-        return static_cast<const char*>(u.m_key);
-    }
     long long when() const noexcept
     { 
         if (FFat())
-            return u.m_pfatentry->when();
-        return FGetPrimaryExpire();
+            return pfatentry()->when();
+        return s.m_whenAndPtrUnion;
     }
 
     void update(const char *subkey, long long when)
@@ -233,30 +239,27 @@ public:
         {
             if (subkey == nullptr)
             {
-                m_when = when;
+                s.m_whenAndPtrUnion = when;
                 return;
             }
             else
             {
                 // we have to upgrade to a fat entry
-                long long whenT = m_when;
-                sdsimmutablestring keyPrimary = u.m_key;
-                m_when |= FFatMask();
-                u.m_pfatentry = new (MALLOC_LOCAL) expireEntryFat(keyPrimary);
-                u.m_pfatentry->expireSubKey(nullptr, whenT);
+                auto pfatentry = new (MALLOC_LOCAL) expireEntryFat();
+                pfatentry->expireSubKey(nullptr, s.m_whenAndPtrUnion);
+                s.m_whenAndPtrUnion = reinterpret_cast<long long>(pfatentry);
+                s.fFat = true;
                 // at this point we're fat so fall through
             }
         }
-        if (subkey == nullptr)
-            m_when = when | FFatMask();
-        u.m_pfatentry->expireSubKey(subkey, when);
+        pfatentry()->expireSubKey(subkey, when);
     }
     
     iter begin() const { return iter(this, 0); }
     iter end() const
     {
         if (FFat())
-            return iter(this, u.m_pfatentry->size());
+            return iter(this, pfatentry()->size());
         return iter(this, 1);
     }
     
@@ -268,26 +271,39 @@ public:
             pfatentry()->m_vecexpireEntries.begin() + itr.m_idx);
     }
 
-    size_t size() const
-    {
+    size_t size() const {
         if (FFat())
-            return u.m_pfatentry->size();
+            return pfatentry()->size();
         return 1;
     }
 
-    long long FGetPrimaryExpire() const noexcept
-    { 
-        return m_when & (~FFatMask()); 
-    }
-
     bool FGetPrimaryExpire(long long *pwhen) const noexcept
     { 
-        *pwhen = FGetPrimaryExpire();
-        return *pwhen != INVALID_EXPIRE;
+        if (FFat()) {
+            return pfatentry()->FGetPrimaryExpire(pwhen);
+        } else {
+            *pwhen = s.m_whenAndPtrUnion;
+            return true;
+        }
+    }
+
+    void *release_as_void() {
+        uint64_t whenT = s.m_whenAndPtrUnion;
+        whenT |= static_cast<uint64_t>(s.fFat) << 63;
+        s.m_whenAndPtrUnion = 0;
+        s.fFat = 0;
+        return reinterpret_cast<void*>(whenT);
+    }
+
+    static expireEntry *from_void(void **src) {
+        uintptr_t llV = reinterpret_cast<uintptr_t>(src);
+        return reinterpret_cast<expireEntry*>(llV);
+    }
+    static const expireEntry *from_void(void *const*src) {
+        uintptr_t llV = reinterpret_cast<uintptr_t>(src);
+        return reinterpret_cast<expireEntry*>(llV);
     }
 
-    explicit operator sdsview() const noexcept { return key(); }
     explicit operator long long() const noexcept { return when(); }
 };
-typedef semiorderedset<expireEntry, sdsview, true /*expireEntry can be memmoved*/> expireset;
-extern fastlock g_expireLock;
+static_assert(sizeof(expireEntry) == sizeof(long long), "This must fit in a long long so it can be put in a dictEntry");

src/lazyfree.cpp

@@ -20,11 +20,9 @@ void lazyfreeFreeObject(void *args[]) {
  * when the database was logically deleted. */
 void lazyfreeFreeDatabase(void *args[]) {
     dict *ht1 = (dict *) args[0];
-    expireset *setexpire = (expireset *) args[1];
 
     size_t numkeys = dictSize(ht1);
     dictRelease(ht1);
-    delete setexpire;
     atomicDecr(lazyfree_objects,numkeys);
     atomicIncr(lazyfreed_objects,numkeys);
 }
@@ -217,17 +215,15 @@ void freeObjAsync(robj *key, robj *obj) {
  * create a new empty set of hash tables and scheduling the old ones for
  * lazy freeing. */
 void redisDbPersistentData::emptyDbAsync() {
-    std::unique_lock<fastlock> ul(g_expireLock);
     dict *oldht1 = m_pdict;
-    auto *set = m_setexpire;
-    m_setexpire = new (MALLOC_LOCAL) expireset();
     m_pdict = dictCreate(&dbDictType,this);
     if (m_spstorage != nullptr)
         m_spstorage->clearAsync();
     if (m_fTrackingChanges)
         m_fAllChanged = true;
     atomicIncr(lazyfree_objects,dictSize(oldht1));
-    bioCreateLazyFreeJob(lazyfreeFreeDatabase,2,oldht1,set);
+    m_numexpires = 0;
+    bioCreateLazyFreeJob(lazyfreeFreeDatabase,2,oldht1,nullptr);
 }
 
 /* Release the radix tree mapping Redis Cluster keys to slots asynchronously. */

src/meminfo.cpp

@@ -0,0 +1,33 @@
+#include <string>
+#include <fstream>
+#include <limits>
+
+static size_t getMemKey(std::string key) {
+# ifdef __linux__
+    std::string token;
+    std::ifstream f("/proc/meminfo");
+    while (f >> token) {
+        if (token == key) {
+            size_t mem_val;
+            if (f >> mem_val) {
+                return mem_val * 1024; // values are in kB
+            } else {
+                return 0;
+            }
+            f.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
+        }
+    }
+    return 0;
+# else
+    (void)key;
+    return 0;
+# endif
+}
+
+size_t getMemAvailable() {
+    return getMemKey("MemAvailable:");
+}
+
+size_t getMemTotal() {
+    return getMemKey("MemTotal:");
+}

src/module.cpp

@@ -656,7 +656,7 @@ void moduleHandlePropagationAfterCommandCallback(RedisModuleCtx *ctx) {
 
     /* We don't need to do anything here if the server isn't inside
      * a transaction. */
-    if (!g_pserver->propagate_in_transaction) return;
+    if (!serverTL->propagate_in_transaction) return;
 
     /* If this command is executed from with Lua or MULTI/EXEC we do not
      * need to propagate EXEC */
@@ -690,8 +690,9 @@ void moduleHandlePropagationAfterCommandCallback(RedisModuleCtx *ctx) {
 }
 
 /* Free the context after the user function was called. */
-void moduleFreeContext(RedisModuleCtx *ctx) {
-    moduleHandlePropagationAfterCommandCallback(ctx);
+void moduleFreeContext(RedisModuleCtx *ctx, bool propogate) {
+    if (propogate)
+        moduleHandlePropagationAfterCommandCallback(ctx);
     autoMemoryCollect(ctx);
     poolAllocRelease(ctx);
     if (ctx->postponed_arrays) {
@@ -1814,7 +1815,7 @@ void moduleReplicateMultiIfNeeded(RedisModuleCtx *ctx) {
      * the module command was called by a script. */
     if (serverTL->in_eval || serverTL->in_exec) return;
     /* If we already emitted MULTI return ASAP. */
-    if (g_pserver->propagate_in_transaction) return;
+    if (serverTL->propagate_in_transaction) return;
     /* If this is a thread safe context, we do not want to wrap commands
      * executed into MULTI/EXEC, they are executed as single commands
      * from an external client in essence. */
@@ -2442,11 +2443,10 @@ int RM_UnlinkKey(RedisModuleKey *key) {
  * If no TTL is associated with the key or if the key is empty,
  * REDISMODULE_NO_EXPIRE is returned. */
 mstime_t RM_GetExpire(RedisModuleKey *key) {
-    std::unique_lock<fastlock> ul(g_expireLock);
-    expireEntry *pexpire = key->db->getExpire(key->key);
+    auto itr = key->db->find(key->key);
     mstime_t expire = INVALID_EXPIRE;
-    if (pexpire != nullptr)
-        pexpire->FGetPrimaryExpire(&expire);
+    if (itr->FExpires())
+        itr->expire.FGetPrimaryExpire(&expire);
     
     if (expire == INVALID_EXPIRE || key->value == NULL)
         return REDISMODULE_NO_EXPIRE;
@@ -7058,7 +7058,7 @@ RedisModuleString *RM_DictPrev(RedisModuleCtx *ctx, RedisModuleDictIter *di, voi
 /* Compare the element currently pointed by the iterator to the specified
  * element given by key/keylen, according to the operator 'op' (the set of
  * valid operators are the same valid for RedisModule_DictIteratorStart).
- * If the comparision is successful the command returns REDISMODULE_OK
+ * If the comparison is successful the command returns REDISMODULE_OK
  * otherwise REDISMODULE_ERR is returned.
  *
  * This is useful when we want to just emit a lexicographical range, so

src/modules/Makefile

@@ -13,7 +13,10 @@ endif
 
 .SUFFIXES: .c .so .xo .o
 
-all: helloworld.so hellotype.so helloblock.so hellocluster.so hellotimer.so hellodict.so hellohook.so helloacl.so
+all: helloworld.so hellotype.so helloblock.so hellocluster.so hellotimer.so hellodict.so hellohook.so helloacl.so build-keydb_modstatsd
+
+build-keydb_modstatsd:
+	$(MAKE) -C keydb_modstatsd
 
 .c.xo:
 	$(CC) -I. $(CFLAGS) $(SHOBJ_CFLAGS) -fPIC -c $< -o $@
@@ -60,3 +63,4 @@ helloacl.so: helloacl.xo
 
 clean:
 	rm -rf *.xo *.so
+	$(MAKE) -C keydb_modstatsd clean

src/modules/keydb_modstatsd/Makefile

@@ -0,0 +1,13 @@
+MODULE_FLAGS := -fPIC -O2 -Wall -Werror
+
+OBJECT_FILES := modmain.o
+MODSNAP_CXX_FLAGS := -std=gnu++14
+
+%.o: %.cpp
+	$(CXX) -o $@ -c $< $(MODULE_FLAGS) -I../../../deps/cpp-statsd-client/include $(MODSNAP_CXX_FLAGS) -g
+
+modstatsd.so: $(OBJECT_FILES)
+	$(CXX) -shared $(OBJECT_FILES) -o modstatsd.so
+
+clean:
+	rm -f $(OBJECT_FILES) modstatsd.so

src/modules/keydb_modstatsd/modmain.cpp

@@ -0,0 +1,722 @@
+#include "redismodule.h"
+#include <stdlib.h>
+#include <cpp-statsd-client/StatsdClient.hpp>
+#include <unordered_map>
+#include <sys/utsname.h>
+#include <algorithm>
+#ifdef __linux__
+#include <sys/sysinfo.h>
+#include <sys/resource.h>
+#endif
+#include <inttypes.h>
+#include <sys/time.h>
+#include <regex>
+#include <sstream>
+#include <iostream>
+#include <fstream>
+
+using namespace Statsd;
+
+class StatsdClientWrapper 
+{
+private:
+    StatsdClient *m_stats;
+    StatsdClient *m_stats_noprefix;
+
+public:
+    StatsdClientWrapper(const std::string& host,
+                        const uint16_t port,
+                        const std::string& prefix,
+                        const uint64_t batchsize,
+                        const uint64_t sendInterval) {
+        m_stats = new StatsdClient(host, port, prefix, batchsize, sendInterval);
+        m_stats_noprefix = new StatsdClient(host, port, "keydb", batchsize, sendInterval);
+    }
+
+    ~StatsdClientWrapper() {
+        delete m_stats;
+        delete m_stats_noprefix;
+    }
+
+    void increment(const std::string& key, const bool prefixOnly = true) {
+        m_stats->increment(key);
+        if (!prefixOnly) m_stats_noprefix->increment(key);
+    }
+
+    void decrement(const std::string& key, const bool prefixOnly = true) {
+        m_stats->decrement(key);
+        if (!prefixOnly) m_stats_noprefix->decrement(key);
+    }
+
+    void count(const std::string& key, const int delta, const bool prefixOnly = true) {
+        m_stats->count(key, delta);
+        if (!prefixOnly) m_stats_noprefix->count(key, delta);
+    }
+
+    template <typename T>
+    void gauge(const std::string& key, const T value, const bool prefixOnly = true) {
+        m_stats->gauge(key, value);
+        if (!prefixOnly) m_stats_noprefix->gauge(key, value);
+    }
+
+    void timing(const std::string& key, const unsigned int ms, const bool prefixOnly = true) {
+        m_stats->timing(key, ms);
+        if (!prefixOnly) m_stats_noprefix->timing(key, ms);
+    }
+};
+
+/* constants */
+static time_t c_infoUpdateSeconds = 10;
+// the current Redis Cluster setup we configure replication factor as 2, each non-empty master node should have 2 replicas, given that there are 3 zones in each regions
+static const int EXPECTED_NUMBER_OF_REPLICAS = 2;
+
+StatsdClientWrapper *g_stats = nullptr;
+std::string m_strPrefix { "keydb" };
+
+const std::regex g_replica_or_db_info_regex { "^(slave|db)(\\d+)" };
+const char *g_string_counter_separator = "__";
+const uint64_t g_stats_buffer_size_bytes = 1600;
+std::string nodeName;
+int unameResult;
+
+enum class StatsD_Type {
+    STATSD_GAUGE_LONGLONG,
+    STATSD_GAUGE_FLOAT,
+    STATSD_GAUGE_BYTES,
+    STATSD_DELTA,
+    STATSD_COUNTER_STRING
+};
+
+struct StatsRecord {
+    StatsD_Type type;
+    bool prefixOnly = true;
+    const char *szAlternate = nullptr;
+
+    /* Dynamic Values */
+    long long prevVal = 0;
+};
+
+std::unordered_map<std::string, StatsRecord> g_mapInfoFields = {
+    // info
+    { "used_memory", { StatsD_Type::STATSD_GAUGE_BYTES, false /* prefixOnly */}},
+    { "used_memory_rss", { StatsD_Type::STATSD_GAUGE_BYTES }},
+    { "maxmemory", { StatsD_Type::STATSD_GAUGE_BYTES, false /* prefixOnly */}},
+    { "used_memory_dataset_perc", { StatsD_Type::STATSD_GAUGE_FLOAT }},
+    { "avg_lock_contention", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "repl_backlog_size", { StatsD_Type::STATSD_GAUGE_BYTES }},
+    { "connected_slaves", { StatsD_Type::STATSD_GAUGE_LONGLONG, true, "connected_replicas" }},
+    { "errorstat_ERR", { StatsD_Type::STATSD_DELTA }},
+    { "connected_clients", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "cluster_connections", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "instantaneous_ops_per_sec", { StatsD_Type::STATSD_GAUGE_LONGLONG, false /* prefixOnly */}},
+    { "instantaneous_input_kbps", { StatsD_Type::STATSD_GAUGE_FLOAT, false /* prefixOnly */}},
+    { "instantaneous_output_kbps", { StatsD_Type::STATSD_GAUGE_FLOAT, false /* prefixOnly */}},
+    { "server_threads", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "mvcc_depth", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "sync_full", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "sync_partial_ok", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "sync_partial_err", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "rdb_bgsave_in_progress", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "rdb_last_bgsave_time_sec", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "used_memory_overhead", { StatsD_Type::STATSD_GAUGE_BYTES }},
+    { "master_sync_in_progress", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "uptime_in_seconds", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "hz", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "configured_hz", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "maxclients", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "client_recent_max_input_buffer", { StatsD_Type::STATSD_GAUGE_BYTES }},
+    { "client_recent_max_output_buffer", { StatsD_Type::STATSD_GAUGE_BYTES }},
+    { "blocked_clients", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "tracking_clients", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "clients_in_timeout_table", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "used_memory_peak", { StatsD_Type::STATSD_GAUGE_BYTES }},
+    { "used_memory_startup", { StatsD_Type::STATSD_GAUGE_BYTES }},
+    { "used_memory_dataset", { StatsD_Type::STATSD_GAUGE_BYTES }},
+    { "allocator_allocated", { StatsD_Type::STATSD_GAUGE_BYTES }},
+    { "allocator_active", { StatsD_Type::STATSD_GAUGE_BYTES }},
+    { "allocator_resident", { StatsD_Type::STATSD_GAUGE_BYTES }},
+    { "total_system_memory", { StatsD_Type::STATSD_GAUGE_BYTES }},
+    { "used_memory_lua", { StatsD_Type::STATSD_GAUGE_BYTES }},
+    { "used_memory_scripts", { StatsD_Type::STATSD_GAUGE_BYTES }},
+    { "number_of_cached_scripts", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "allocator_frag_ratio", { StatsD_Type::STATSD_GAUGE_FLOAT }},
+    { "allocator_frag_bytes", { StatsD_Type::STATSD_GAUGE_BYTES }},
+    { "allocator_rss_ratio", { StatsD_Type::STATSD_GAUGE_FLOAT }},
+    { "allocator_rss_bytes", { StatsD_Type::STATSD_GAUGE_BYTES }},
+    { "rss_overhead_ratio", { StatsD_Type::STATSD_GAUGE_FLOAT }},
+    { "rss_overhead_bytes", { StatsD_Type::STATSD_GAUGE_BYTES }},
+    { "mem_fragmentation_ratio", { StatsD_Type::STATSD_GAUGE_FLOAT }},
+    { "mem_fragmentation_bytes", { StatsD_Type::STATSD_GAUGE_BYTES }},
+    { "mem_not_counted_for_evict", { StatsD_Type::STATSD_GAUGE_BYTES }},
+    { "mem_replication_backlog", { StatsD_Type::STATSD_GAUGE_BYTES }},
+    { "mem_clients_slaves", { StatsD_Type::STATSD_GAUGE_BYTES }},
+    { "mem_clients_normal", { StatsD_Type::STATSD_GAUGE_BYTES }},
+    { "mem_aof_buffer", { StatsD_Type::STATSD_GAUGE_BYTES }},
+    { "active_defrag_running", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "lazyfree_pending_objects", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "lazyfreed_objects", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "loading", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "current_cow_peak", { StatsD_Type::STATSD_GAUGE_BYTES }},
+    { "current_cow_size", { StatsD_Type::STATSD_GAUGE_BYTES }},
+    { "current_cow_size_age", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "current_fork_perc", { StatsD_Type::STATSD_GAUGE_FLOAT }},
+    { "current_save_keys_processed", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "current_save_keys_total", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "rdb_changes_since_last_save", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "rdb_last_save_time", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "rdb_last_cow_size", { StatsD_Type::STATSD_GAUGE_BYTES }},
+    { "aof_enabled", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "aof_rewrite_in_progress", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "aof_rewrite_scheduled", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "aof_last_cow_size", { StatsD_Type::STATSD_GAUGE_BYTES }},
+    { "module_fork_in_progress", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "module_fork_last_cow_size", { StatsD_Type::STATSD_GAUGE_BYTES }},
+    { "aof_current_size", { StatsD_Type::STATSD_GAUGE_BYTES }},
+    { "aof_base_size", { StatsD_Type::STATSD_GAUGE_BYTES }},
+    { "aof_pending_rewrite", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "aof_buffer_length", { StatsD_Type::STATSD_GAUGE_BYTES }},
+    { "aof_rewrite_buffer_length", { StatsD_Type::STATSD_GAUGE_BYTES }},
+    { "aof_pending_bio_fsync", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "aof_delayed_fsync", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "total_connections_received", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "total_commands_processed", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "total_net_input_bytes", { StatsD_Type::STATSD_GAUGE_BYTES }},
+    { "total_net_output_bytes", { StatsD_Type::STATSD_GAUGE_BYTES }},
+    { "rejected_connections", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "expired_keys", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "expired_stale_perc", { StatsD_Type::STATSD_GAUGE_FLOAT }},
+    { "expired_time_cap_reached_count", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "expire_cycle_cpu_milliseconds", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "evicted_keys", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "keyspace_hits", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "keyspace_misses", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "pubsub_channels", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "pubsub_patterns", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "latest_fork_usec", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "total_forks", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "migrate_cached_sockets", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "slave_expires_tracked_keys", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "active_defrag_hits", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "active_defrag_misses", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "active_defrag_key_hits", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "active_defrag_key_misses", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "tracking_total_keys", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "tracking_total_items", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "tracking_total_prefixes", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "unexpected_error_replies", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "total_error_replies", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "dump_payload_sanitizations", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "total_reads_processed", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "total_writes_processed", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "instantaneous_lock_contention", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "avg_lock_contention", { StatsD_Type::STATSD_GAUGE_FLOAT }},
+    { "storage_provider_read_hits", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "storage_provider_read_misses", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "repl_backlog_active", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "repl_backlog_size", { StatsD_Type::STATSD_GAUGE_BYTES }},
+    { "repl_backlog_first_byte_offset", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "repl_backlog_histlen", { StatsD_Type::STATSD_GAUGE_BYTES }},
+    { "used_cpu_sys", { StatsD_Type::STATSD_GAUGE_FLOAT }},
+    { "used_cpu_user", { StatsD_Type::STATSD_GAUGE_FLOAT }},
+    { "used_cpu_sys_children", { StatsD_Type::STATSD_GAUGE_FLOAT }},
+    { "used_cpu_user_children", { StatsD_Type::STATSD_GAUGE_FLOAT }},
+    { "used_cpu_user_children", { StatsD_Type::STATSD_GAUGE_FLOAT }},
+    { "long_lock_waits", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "used_cpu_sys_main_thread", { StatsD_Type::STATSD_GAUGE_FLOAT }},
+    { "used_cpu_user_main_thread", { StatsD_Type::STATSD_GAUGE_FLOAT }},
+    { "master_sync_total_bytes", { StatsD_Type::STATSD_GAUGE_BYTES }},
+    { "master_sync_read_bytes", { StatsD_Type::STATSD_GAUGE_BYTES }},
+    { "master_sync_last_io_seconds_ago", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "master_link_down_since_seconds", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "maxmemory_policy", { StatsD_Type::STATSD_COUNTER_STRING }},
+    { "role", { StatsD_Type::STATSD_COUNTER_STRING }},
+    { "master_global_link_status", { StatsD_Type::STATSD_COUNTER_STRING }},
+    { "master_link_status", { StatsD_Type::STATSD_COUNTER_STRING }},
+    { "master_failover_state", { StatsD_Type::STATSD_COUNTER_STRING }},
+    { "rdb_last_bgsave_status", { StatsD_Type::STATSD_COUNTER_STRING }},
+    { "rdb_saves", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "instantaneous_input_repl_kbps", { StatsD_Type::STATSD_GAUGE_FLOAT }},
+    { "instantaneous_output_repl_kbps", { StatsD_Type::STATSD_GAUGE_FLOAT }},
+    { "master_host", { StatsD_Type::STATSD_COUNTER_STRING }},
+    { "master_repl_offset", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "second_repl_offset", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "slave_repl_offset", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "redis_version", { StatsD_Type::STATSD_COUNTER_STRING }},
+    { "redis_git_sha1", { StatsD_Type::STATSD_COUNTER_STRING }},
+    // cluster info
+    { "cluster_state", { StatsD_Type::STATSD_COUNTER_STRING }},
+    { "cluster_slots_assigned", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "cluster_slots_ok", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "cluster_slots_pfail", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "cluster_slots_fail", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "cluster_known_nodes", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "cluster_size", { StatsD_Type::STATSD_GAUGE_LONGLONG }},
+    { "storage_flash_available_bytes", { StatsD_Type::STATSD_GAUGE_BYTES }},
+    { "storage_flash_total_bytes", { StatsD_Type::STATSD_GAUGE_BYTES }},
+};
+
+/* Globals */
+static uint64_t g_cclients = 0;
+
+long long ustime(void) {
+    struct timeval tv;
+    long long ust;
+
+    gettimeofday(&tv, NULL);
+    ust = ((long long)tv.tv_sec)*1000000;
+    ust += tv.tv_usec;
+    return ust;
+}
+
+void event_client_change_handler(struct RedisModuleCtx *ctx, RedisModuleEvent eid, uint64_t subevent, void *data) {
+    if (eid.id != REDISMODULE_EVENT_CLIENT_CHANGE)
+        return;
+
+    uint64_t clientsStart = g_cclients;
+    switch (subevent) {
+        case REDISMODULE_SUBEVENT_CLIENT_CHANGE_CONNECTED:
+            ++g_cclients;
+            g_stats->increment("clients_added");
+            RedisModule_Log(ctx, REDISMODULE_LOGLEVEL_DEBUG, "Emitting metric increment for \"clients_added\"");
+            break;
+
+        case REDISMODULE_SUBEVENT_CLIENT_CHANGE_DISCONNECTED:
+            --g_cclients;
+            g_stats->increment("clients_disconnected");
+            RedisModule_Log(ctx, REDISMODULE_LOGLEVEL_DEBUG, "Emitting metric increment for \"clients_disconnected\"");
+            break;
+    }
+
+    if (g_cclients != clientsStart) {
+        g_stats->gauge("clients", g_cclients);
+        RedisModule_Log(ctx, REDISMODULE_LOGLEVEL_DEBUG, "Emitting metric \"clients\": %" PRIu64, g_cclients);
+    }
+}
+
+void handleStatItem(struct RedisModuleCtx *ctx, std::string name, StatsRecord &record, const char *pchValue) {
+    switch (record.type) {
+        case StatsD_Type::STATSD_GAUGE_LONGLONG: {
+            long long val = strtoll(pchValue, nullptr, 10);
+            g_stats->gauge(name, val, record.prefixOnly);
+            RedisModule_Log(ctx, REDISMODULE_LOGLEVEL_DEBUG, "Emitting metric \"%s\": %lld", name.c_str(), val);
+            break;
+        }
+
+        case StatsD_Type::STATSD_GAUGE_FLOAT: {
+            double val = strtod(pchValue, nullptr);
+            g_stats->gauge(name, val, record.prefixOnly);
+            RedisModule_Log(ctx, REDISMODULE_LOGLEVEL_DEBUG, "Emitting metric \"%s\": %f", name.c_str(), val);
+            break;
+        }
+
+        case StatsD_Type::STATSD_GAUGE_BYTES: {
+            long long val = strtoll(pchValue, nullptr, 10);
+            g_stats->gauge(name + "_MB", val / 1024/1024, record.prefixOnly);
+            RedisModule_Log(ctx, REDISMODULE_LOGLEVEL_DEBUG, "Emitting metric \"%s\": %llu", (name + "_MB").c_str(), val / 1024/1024);
+            break;
+        }
+
+        case StatsD_Type::STATSD_DELTA: {
+            long long val = strtoll(pchValue, nullptr, 10);
+            g_stats->count(name, val - record.prevVal, record.prefixOnly);
+            RedisModule_Log(ctx, REDISMODULE_LOGLEVEL_DEBUG, "Emitting metric count for \"%s\": %lld", name.c_str() , val - record.prevVal);
+            record.prevVal = val;
+            break;
+        }
+
+        case StatsD_Type::STATSD_COUNTER_STRING: {
+            // parse val string
+            const char *pNewLine = strchr(pchValue, '\r');
+            if (pNewLine == nullptr) {
+                pNewLine = strchr(pchValue, '\n');
+            }
+            if (pNewLine == nullptr) {
+                g_stats->increment("STATSD_COUNTER_STRING_failed", 1);
+                return;
+            }
+            std::string val(pchValue, pNewLine - pchValue);
+            std::replace(val.begin(), val.end(), '.', '-');
+            // metrics emit
+            std::string metricsName = name + g_string_counter_separator + val;
+            g_stats->increment(metricsName, 1);
+            RedisModule_Log(ctx, REDISMODULE_LOGLEVEL_DEBUG, "Emitting metric \"%s\"", metricsName.c_str());
+            break;
+        }
+
+        default:
+            RedisModule_Log(ctx, REDISMODULE_LOGLEVEL_WARNING, "Unknown stats record type for the key \"%s\": %u", name.c_str(), (unsigned)record.type);
+            break;
+    }
+}
+
+void handleErrorStatItem(struct RedisModuleCtx *ctx, std::string name, std::string rest) {
+    size_t idx = rest.find('=');
+    if (idx != std::string::npos) {
+        std::string statValue = rest.substr(idx + 1);
+        long long val = strtoll(statValue.c_str(), nullptr, 10);
+        g_stats->gauge(name, val);
+        RedisModule_Log(ctx, REDISMODULE_LOGLEVEL_DEBUG, "Emitting metric \"%s\": %lld", name.c_str(), val);
+    } else {
+        RedisModule_Log(ctx, REDISMODULE_LOGLEVEL_WARNING, "Unexpected errorstat line format returned by \"INFO\" command: \"%s\"", (name + rest).c_str());
+    }
+}
+
+void handleReplicaOrDbInfoItem(struct RedisModuleCtx *ctx, std::string name, std::string rest) {
+    //use a stringstream to extract each metric of the form <name>=<value>
+    std::stringstream metrics(rest);
+    while (metrics.good()) {
+        std::string metric;
+        std::getline(metrics, metric, ',');
+        size_t idx = metric.find('=');
+        if (idx != std::string::npos) {
+            std::string stat = metric.substr(0, idx);
+            std::string statName = name + '-' + stat;
+            //idx + 1 to ignore the = sign
+            std::string statValue = metric.substr(idx + 1);
+            // string values
+            if (stat == "ip" || stat == "state") {
+                std::replace(statValue.begin(), statValue.end(), '.', '-');
+                statName += g_string_counter_separator + statValue;
+                g_stats->increment(statName, 1);
+                RedisModule_Log(ctx, REDISMODULE_LOGLEVEL_DEBUG, "Emitting metric \"%s\"", statName.c_str());
+            } else {
+                long long val = strtoll(statValue.c_str(), nullptr, 10);
+                g_stats->gauge(statName, val);
+                RedisModule_Log(ctx, REDISMODULE_LOGLEVEL_DEBUG, "Emitting metric \"%s\": %lld", statName.c_str(), val);
+            }
+        }
+    }
+}
+
+void handle_info_response(struct RedisModuleCtx *ctx, const char *szReply, size_t len, const char *command) {
+    
+    #define SAFETY_CHECK_POINTER(_p) ((_p) < (szReply + len))
+
+    // Parse the INFO reply string line by line
+    const char *pchLineStart = szReply;
+
+    while (SAFETY_CHECK_POINTER(pchLineStart) && *pchLineStart != '\0') {
+        // Loop Each Line
+        const char *pchColon = pchLineStart;
+        while (SAFETY_CHECK_POINTER(pchColon) && *pchColon != ':' && *pchColon != '\r') {
+            ++pchColon;
+        }
+        if (!SAFETY_CHECK_POINTER(pchColon)) {
+            RedisModule_Log(ctx, REDISMODULE_LOGLEVEL_WARNING, "Unexpected line termination when parsing response from %s command: \"%s\"", command, pchLineStart);
+            break; // BUG
+        }
+        const char *pchLineEnd = pchColon;
+        while (SAFETY_CHECK_POINTER(pchLineEnd) && *pchLineEnd != '\n')
+            ++pchLineEnd;
+        
+        std::string strCheck(pchLineStart, pchColon - pchLineStart);
+        if (strCheck.find("errorstat_") != std::string::npos) {
+            std::string remainder(pchColon + 1, pchLineEnd - (pchColon + 1));
+            handleErrorStatItem(ctx, strCheck, remainder);
+        } else if (std::regex_match(strCheck, g_replica_or_db_info_regex)) {
+            std::string remainder(pchColon + 1, pchLineEnd - (pchColon + 1));
+            handleReplicaOrDbInfoItem(ctx, strCheck, remainder);
+        } else {
+            auto itr = g_mapInfoFields.find(strCheck);
+            if (itr != g_mapInfoFields.end()) {
+                // This is an info field we care about
+                if (itr->second.szAlternate != nullptr)
+                    strCheck = itr->second.szAlternate;
+                handleStatItem(ctx, strCheck, itr->second, pchColon+1);
+            }
+        }
+
+        RedisModule_Log(ctx, REDISMODULE_LOGLEVEL_DEBUG, "INFO response line: \"%s\"", std::string(pchLineStart, pchLineEnd - pchLineStart).c_str());
+        pchLineStart = pchLineEnd + 1;    // start of next line, if we're over the loop will catch it
+    }
+
+    #undef SAFETY_CHECK_POINTER
+}
+
+void handle_cluster_nodes_response(struct RedisModuleCtx *ctx, const char *szReply, size_t len) {
+    #define SAFETY_CHECK_POINTER(_p) ((_p) < (szReply + len))
+    const char *pchLineStart = szReply;
+    long long primaries = 0;
+    long long replicas = 0;
+    while (SAFETY_CHECK_POINTER(pchLineStart) && *pchLineStart != '\0') {
+        // Loop Each Line
+        const char *pchLineEnd = pchLineStart;
+        while (SAFETY_CHECK_POINTER(pchLineEnd) && (*pchLineEnd != '\r') && (*pchLineEnd != '\n')) {
+            ++pchLineEnd;
+        }
+        std::string line(pchLineStart, pchLineEnd - pchLineStart);
+        RedisModule_Log(ctx, REDISMODULE_LOGLEVEL_DEBUG, "Cluster Nodes Line: \"%s\"", line.c_str());
+        if (std::string::npos != line.find("master")) {
+            ++primaries;
+        } else if (std::string::npos != line.find("slave")) {
+            ++replicas;
+        } else {
+            RedisModule_Log(ctx, REDISMODULE_LOGLEVEL_WARNING, "Unexpected NODE format returned by \"CLUSTER NODES\" command: \"%s\"", line.c_str());
+        }
+        // emit myself stat
+        if (line.find("myself") != std::string::npos) {
+            size_t firstSpaceIdx = line.find(' ');
+            // emit cluster node id
+            if (firstSpaceIdx != std::string::npos) {
+                std::string nodeIdStat = "cluster_node_id";
+                nodeIdStat += g_string_counter_separator + line.substr(0, firstSpaceIdx);
+                g_stats->increment(nodeIdStat);
+            }
+            // emit node ip
+            size_t firstColonIdx = line.find(':');
+            if (firstColonIdx != std::string::npos) {
+                std::string nodeIpStat = "cluster_node_ip";
+                std::string nodeIP = line.substr(firstSpaceIdx+1, firstColonIdx-firstSpaceIdx-1);
+                std::replace(nodeIP.begin(), nodeIP.end(), '.', '-');
+                nodeIpStat += g_string_counter_separator + nodeIP;
+                g_stats->increment(nodeIpStat);
+            }
+        }
+        pchLineStart = pchLineEnd;
+        while (SAFETY_CHECK_POINTER(pchLineStart) && ((*pchLineStart == '\r') || (*pchLineStart == '\n'))) {
+            ++pchLineStart;
+        }
+    }
+    g_stats->gauge("primaries", primaries);
+    RedisModule_Log(ctx, REDISMODULE_LOGLEVEL_DEBUG, "Emitting metric \"primaries\": %llu", primaries);
+    g_stats->gauge("replicas", replicas);
+    RedisModule_Log(ctx, REDISMODULE_LOGLEVEL_DEBUG, "Emitting metric \"replicas\": %llu", replicas);
+    #undef SAFETY_CHECK_POINTER
+}
+
+void handle_client_list_response(struct RedisModuleCtx *ctx, const char *szReply, size_t len) {
+    size_t totalClientOutputBuffer = 0;
+    size_t totalReplicaClientOutputBuffer = 0;
+    #define SAFETY_CHECK_POINTER(_p) ((_p) < (szReply + len))
+    const char *pchLineStart = szReply;
+    while (SAFETY_CHECK_POINTER(pchLineStart) && *pchLineStart != '\0') {
+        // Loop Each Line
+        const char *pchLineEnd = pchLineStart;
+        while (SAFETY_CHECK_POINTER(pchLineEnd) && (*pchLineEnd != '\r') && (*pchLineEnd != '\n')) {
+            ++pchLineEnd;
+        }
+        std::string line(pchLineStart, pchLineEnd - pchLineStart);
+        RedisModule_Log(ctx, REDISMODULE_LOGLEVEL_DEBUG, "Client List Line: \"%s\"", line.c_str());
+
+        // recover output buffer size for client
+        bool lineFailed = false;
+        bool replica = line.find("flags=S") != std::string::npos;
+        size_t idx = line.find("omem");
+        if (!(lineFailed = (idx == std::string::npos))) {
+            std::string rest = line.substr(idx);
+            size_t startIdx = rest.find("=");
+            if (!(lineFailed = (startIdx == std::string::npos))) {
+                size_t endIdx = rest.find(" ");
+                if (!(lineFailed = (endIdx == std::string::npos))) {
+                    // use startIdx + 1 and endIdx - 1 to exclude the '=' and ' ' characters
+                    std::string valueString = rest.substr(startIdx + 1, (endIdx - 1) - (startIdx + 1));
+                    size_t value = strtoll(valueString.c_str(), nullptr, 10);
+                    totalClientOutputBuffer += value;
+                    if (replica) {
+                        totalReplicaClientOutputBuffer += value;
+                    }
+                }
+            }
+        }
+
+        if (lineFailed) {
+            RedisModule_Log(ctx, REDISMODULE_LOGLEVEL_WARNING, "Unexpected CLIENT format returned by \"CLIENT LIST\" command: \"%s\"", line.c_str());
+        }
+
+        pchLineStart = pchLineEnd;
+        while (SAFETY_CHECK_POINTER(pchLineStart) && ((*pchLineStart == '\r') || (*pchLineStart == '\n'))) {
+            ++pchLineStart;
+        }
+    }
+    #undef SAFETY_CHECK_POINTER
+    g_stats->gauge("total_client_output_buffer", totalClientOutputBuffer);
+    g_stats->gauge("total_replica_client_output_buffer", totalReplicaClientOutputBuffer);
+}
+
+void emit_system_free_memory() {
+    std::ifstream meminfo("/proc/meminfo");
+    std::string line;
+    while (std::getline(meminfo, line)) {
+        if (line.find("MemAvailable:") != std::string::npos) {
+            unsigned long memAvailableInKB;
+            std::sscanf(line.c_str(), "MemAvailable: %lu kB", &memAvailableInKB);
+            g_stats->gauge("systemAvailableMemory_MB", memAvailableInKB / 1024);
+            return;
+        }
+    }
+}
+
+void emit_metrics_for_insufficient_replicas(struct RedisModuleCtx *ctx, long long keys) {
+    // non-empty
+    if (keys <= 0) {
+        return;
+    }
+    RedisModuleCallReply *reply = RedisModule_Call(ctx, "ROLE", "");
+    if (RedisModule_CallReplyType(reply) != REDISMODULE_REPLY_ARRAY) {
+        RedisModule_FreeCallReply(reply);
+        return;
+    }
+    RedisModuleCallReply *roleReply = RedisModule_CallReplyArrayElement(reply, 0);
+    if (RedisModule_CallReplyType(roleReply) != REDISMODULE_REPLY_STRING) {
+        RedisModule_FreeCallReply(reply);
+        return;
+    }
+    size_t len;
+    const char *role = RedisModule_CallReplyStringPtr(roleReply, &len);
+    // check if the current node is a primary
+    if (strncmp(role, "master", len) == 0) {
+        RedisModuleCallReply *replicasReply = RedisModule_CallReplyArrayElement(reply, 2);
+        // check if there are less than 2 connected replicas
+        if (RedisModule_CallReplyLength(replicasReply) < EXPECTED_NUMBER_OF_REPLICAS) {
+            g_stats->increment("lessThanExpectedReplicas_error", 1);
+        }
+    }
+    RedisModule_FreeCallReply(reply);
+}
+
+void event_cron_handler(struct RedisModuleCtx *ctx, RedisModuleEvent eid, uint64_t subevent, void *data) {
+    static time_t lastTime = 0;
+    time_t curTime = time(nullptr);
+
+    if ((curTime - lastTime) > c_infoUpdateSeconds) {
+        size_t startTime = ustime();
+
+#ifdef __linux__
+	/* Log CPU Usage */
+	static long long s_mscpuLast = 0;
+	struct rusage self_ru;
+	getrusage(RUSAGE_SELF, &self_ru);
+
+	long long mscpuCur = (self_ru.ru_utime.tv_sec * 1000) + (self_ru.ru_utime.tv_usec / 1000)
+			+ (self_ru.ru_stime.tv_sec * 1000) + (self_ru.ru_stime.tv_usec / 1000);
+
+
+	g_stats->gauge("cpu_load_perc", ((double)(mscpuCur - s_mscpuLast) / ((curTime - lastTime)*1000))*100, false /* prefixOnly */);   
+	s_mscpuLast = mscpuCur;
+#endif
+
+        /* Log clients */
+        g_stats->gauge("clients", g_cclients);
+
+        /* node name */
+        if (unameResult == 0) {
+            g_stats->increment("node_name" + std::string(g_string_counter_separator) + nodeName);
+        }
+
+        /* Log INFO Fields */
+        size_t commandStartTime = ustime();
+        RedisModuleCallReply *reply = RedisModule_Call(ctx, "INFO", "");
+        size_t len = 0;
+        const char *szReply = RedisModule_CallReplyStringPtr(reply, &len);
+        g_stats->timing("info_time_taken_us", ustime() - commandStartTime);
+        commandStartTime = ustime();
+        handle_info_response(ctx, szReply, len, "INFO");
+        g_stats->timing("handle_info_time_taken_us", ustime() - commandStartTime);
+        RedisModule_FreeCallReply(reply);
+
+        /* Log CLUSTER INFO Fields */
+        commandStartTime = ustime();
+        reply = RedisModule_Call(ctx, "CLUSTER", "c", "INFO");
+        szReply = RedisModule_CallReplyStringPtr(reply, &len);
+        g_stats->timing("cluster_info_time_taken_us", ustime() - commandStartTime);
+        commandStartTime = ustime();
+        handle_info_response(ctx, szReply, len, "CLUSTER INFO");
+        g_stats->timing("handle_cluster_info_time_taken_us", ustime() - commandStartTime);
+        RedisModule_FreeCallReply(reply);
+
+        /* Log Cluster Topology */
+        commandStartTime = ustime();
+        reply = RedisModule_Call(ctx, "CLUSTER", "c", "NODES");
+        szReply = RedisModule_CallReplyStringPtr(reply, &len);
+        g_stats->timing("cluster_nodes_time_taken_us", ustime() - commandStartTime);
+        commandStartTime = ustime();
+        handle_cluster_nodes_response(ctx, szReply, len);
+        g_stats->timing("handle_cluster_nodes_time_taken_us", ustime() - commandStartTime);
+        RedisModule_FreeCallReply(reply);
+
+        /* Log Client Info */
+        // commandStartTime = ustime();
+        // reply = RedisModule_Call(ctx, "CLIENT", "c", "LIST");
+        // szReply = RedisModule_CallReplyStringPtr(reply, &len);
+        // g_stats->timing("client_info_time_taken_us", ustime() - commandStartTime);
+        // commandStartTime = ustime();
+        // handle_client_list_response(ctx, szReply, len);
+        // g_stats->timing("handle_client_info_time_taken_us", ustime() - commandStartTime);
+        // RedisModule_FreeCallReply(reply);
+
+        commandStartTime = ustime();
+        emit_system_free_memory();
+        g_stats->timing("emit_free_system_memory_time_taken_us", ustime() - commandStartTime);
+
+        /* Log Keys */
+        commandStartTime = ustime();
+        reply = RedisModule_Call(ctx, "dbsize", "");
+        long long keys = RedisModule_CallReplyInteger(reply);
+        RedisModule_FreeCallReply(reply);
+        g_stats->gauge("keys", keys, false /* prefixOnly */);
+        RedisModule_Log(ctx, REDISMODULE_LOGLEVEL_DEBUG, "Emitting metric \"keys\": %llu", keys);
+        g_stats->timing("emit_keys_metric_time_taken_us", ustime() - commandStartTime);
+
+        emit_metrics_for_insufficient_replicas(ctx, keys);
+
+        g_stats->timing("metrics_time_taken_us", ustime() - startTime);
+        
+	lastTime = curTime;
+    }
+}
+
+extern "C" int RedisModule_OnLoad(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) {
+    if (RedisModule_Init(ctx,"statsd",1,REDISMODULE_APIVER_1) == REDISMODULE_ERR) 
+        return REDISMODULE_ERR;
+
+    RedisModule_AutoMemory(ctx);
+    /* Use pod name if available*/
+    const char *podName = getenv("POD_NAME");
+    utsname sysName;
+    unameResult = uname(&sysName);
+    if (unameResult == 0) {
+        nodeName = std::string(sysName.nodename);
+        std::replace(nodeName.begin(), nodeName.end(), '.', '-');
+    }
+    if (podName != nullptr) {
+        m_strPrefix = podName;
+        std::replace(m_strPrefix.begin(), m_strPrefix.end(), '.', '-');
+    }
+    else if (unameResult == 0) {
+        m_strPrefix = nodeName;
+        unameResult = 1;
+    }
+
+    for (int iarg = 0; iarg < argc; ++iarg) {
+        size_t len = 0;
+        const char *rgchArg = RedisModule_StringPtrLen(argv[iarg], &len);
+        if (len == 6 && memcmp(rgchArg, "prefix", 6) == 0) {
+            if ((iarg+1) >= argc) {
+                RedisModule_Log(ctx, REDISMODULE_LOGLEVEL_WARNING, "Expected a value after 'prefix'");
+                return REDISMODULE_ERR;
+            }
+            ++iarg;
+            size_t lenPrefix = 0;
+            const char *rgchPrefix = RedisModule_StringPtrLen(argv[iarg], &lenPrefix);
+            m_strPrefix = std::string(rgchPrefix, lenPrefix);
+        } else {
+            RedisModule_Log(ctx, REDISMODULE_LOGLEVEL_WARNING, "Unrecognized configuration flag");
+            return REDISMODULE_ERR;
+        }
+    }
+
+    g_stats = new StatsdClientWrapper("localhost", 8125, m_strPrefix, g_stats_buffer_size_bytes, c_infoUpdateSeconds * 1000);
+
+    if (RedisModule_SubscribeToServerEvent(ctx, RedisModuleEvent_ClientChange, event_client_change_handler) == REDISMODULE_ERR)
+        return REDISMODULE_ERR;
+
+    if (RedisModule_SubscribeToServerEvent(ctx, RedisModuleEvent_CronLoop, event_cron_handler) == REDISMODULE_ERR)
+        return REDISMODULE_ERR;
+    
+    return REDISMODULE_OK;
+}
+
+extern "C" int RedisModule_OnUnload(RedisModuleCtx *ctx) {
+    delete g_stats;
+    return REDISMODULE_OK;
+}

src/multi.cpp

@@ -118,14 +118,14 @@ void discardCommand(client *c) {
 
 void beforePropagateMulti() {
     /* Propagating MULTI */
-    serverAssert(!g_pserver->propagate_in_transaction);
-    g_pserver->propagate_in_transaction = 1;
+    serverAssert(!serverTL->propagate_in_transaction);
+    serverTL->propagate_in_transaction = 1;
 }
 
 void afterPropagateExec() {
     /* Propagating EXEC */
-    serverAssert(g_pserver->propagate_in_transaction == 1);
-    g_pserver->propagate_in_transaction = 0;
+    serverAssert(serverTL->propagate_in_transaction == 1);
+    serverTL->propagate_in_transaction = 0;
 }
 
 /* Send a MULTI command to all the slaves and AOF file. Check the execCommand
@@ -264,7 +264,7 @@ void execCommand(client *c) {
 
     /* Make sure the EXEC command will be propagated as well if MULTI
      * was already propagated. */
-    if (g_pserver->propagate_in_transaction) {
+    if (serverTL->propagate_in_transaction) {
         int is_master = listLength(g_pserver->masters) == 0;
         g_pserver->dirty++;
         /* If inside the MULTI/EXEC block this instance was suddenly

src/networking.cpp

@@ -163,7 +163,6 @@ client *createClient(connection *conn, int iel) {
     c->multibulklen = 0;
     c->bulklen = -1;
     c->sentlen = 0;
-    c->sentlenAsync = 0;
     c->flags = 0;
     c->fPendingAsyncWrite = FALSE;
     c->fPendingAsyncWriteHandler = FALSE;
@@ -1177,6 +1176,11 @@ int chooseBestThreadForAccept()
 void clientAcceptHandler(connection *conn) {
     client *c = (client*)connGetPrivateData(conn);
 
+    if (conn->flags & CONN_FLAG_AUDIT_LOGGING_REQUIRED) {
+        c->flags |= CLIENT_AUDIT_LOGGING;
+        c->fprint = conn->fprint;
+    }
+
     if (connGetState(conn) != CONN_STATE_CONNECTED) {
         serverLog(LL_WARNING,
                 "Error accepting a client connection: %s",
@@ -1240,6 +1244,7 @@ void clientAcceptHandler(connection *conn) {
 
 #define MAX_ACCEPTS_PER_CALL 1000
 #define MAX_ACCEPTS_PER_CALL_TLS 100
+
 static void acceptCommonHandler(connection *conn, int flags, char *ip, int iel) {
     client *c;
     char conninfo[100];
@@ -1276,24 +1281,27 @@ static void acceptCommonHandler(connection *conn, int flags, char *ip, int iel)
      * called, because we don't want to even start transport-level negotiation
      * if rejected. */
     if (listLength(g_pserver->clients) + getClusterConnectionsCount()
-        >= g_pserver->maxclients)
+        >= (g_pserver->maxclients - g_pserver->maxclientsReserved))
     {
-        const char *err;
-        if (g_pserver->cluster_enabled)
-            err = "-ERR max number of clients + cluster "
-                  "connections reached\r\n";
-        else
-            err = "-ERR max number of clients reached\r\n";
+        // Allow the connection if it comes from localhost and we're within the maxclientReserved buffer range
+        if ((listLength(g_pserver->clients) + getClusterConnectionsCount()) >= g_pserver->maxclients || strcmp("127.0.0.1", ip)) {
+            const char *err;
+            if (g_pserver->cluster_enabled)
+                err = "-ERR max number of clients + cluster "
+                    "connections reached\r\n";
+            else
+                err = "-ERR max number of clients reached\r\n";
 
-        /* That's a best effort error message, don't check write errors.
-         * Note that for TLS connections, no handshake was done yet so nothing
-         * is written and the connection will just drop. */
-        if (connWrite(conn,err,strlen(err)) == -1) {
-            /* Nothing to do, Just to avoid the warning... */
+            /* That's a best effort error message, don't check write errors.
+            * Note that for TLS connections, no handshake was done yet so nothing
+            * is written and the connection will just drop. */
+            if (connWrite(conn,err,strlen(err)) == -1) {
+                /* Nothing to do, Just to avoid the warning... */
+            }
+            g_pserver->stat_rejected_conn++;
+            connClose(conn);
+            return;
         }
-        g_pserver->stat_rejected_conn++;
-        connClose(conn);
-        return;
     }
 
     /* Create connection and client */
@@ -2753,7 +2761,7 @@ void readQueryFromClient(connection *conn) {
 
     if (cserver.cthreads > 1 || g_pserver->m_pstorageFactory) {
         parseClientCommandBuffer(c);
-        if (g_pserver->enable_async_commands && !serverTL->disable_async_commands && listLength(g_pserver->monitors) == 0 && (aeLockContention() || serverTL->rgdbSnapshot[c->db->id] || g_fTestMode)) {
+        if (g_pserver->enable_async_commands && !serverTL->disable_async_commands && listLength(g_pserver->monitors) == 0 && (aeLockContention() || serverTL->rgdbSnapshot[c->db->id] || g_fTestMode) && !serverTL->in_eval && !serverTL->in_exec) {
             // Frequent writers aren't good candidates for this optimization, they cause us to renew the snapshot too often
             //  so we exclude them unless the snapshot we need already exists.
             // Note: In test mode we want to create snapshots as often as possibl to excercise them - we don't care about perf
@@ -3248,16 +3256,18 @@ NULL
                 }
                 else
                 {
-                    int iel = client->iel;
                     freeClientAsync(client);
-                    aePostFunction(g_pserver->rgthreadvar[client->iel].el, [iel] {  // note: failure is OK
-                        freeClientsInAsyncFreeQueue(iel);
-                    });
                 }
             }
             killed++;
         }
 
+        for (int iel = 0; iel < cserver.cthreads; ++iel) {
+            aePostFunction(g_pserver->rgthreadvar[iel].el, [iel] {  // note: failure is OK
+                freeClientsInAsyncFreeQueue(iel);
+            });
+        }
+
         /* Reply according to old/new format. */
         if (c->argc == 3) {
             if (killed == 0)
@@ -3995,7 +4005,7 @@ void pauseClients(mstime_t end, pause_type type) {
      * to track this state so that we don't assert
      * in propagate(). */
     if (serverTL->in_exec) {
-        g_pserver->client_pause_in_transaction = 1;
+        serverTL->client_pause_in_transaction = 1;
     }
 }
 

src/object.cpp

@@ -46,6 +46,7 @@ robj *createObject(int type, void *ptr) {
     char *oB = (char*)zcalloc(sizeof(robj)+mvccExtraBytes, MALLOC_SHARED);
     robj *o = reinterpret_cast<robj*>(oB + mvccExtraBytes);
     
+    new (o) redisObject;
     o->type = type;
     o->encoding = OBJ_ENCODING_RAW;
     o->m_ptr = ptr;
@@ -418,6 +419,7 @@ void decrRefCount(robj_roptr o) {
         case OBJ_NESTEDHASH: freeNestedHashObject(o); break;
         default: serverPanic("Unknown object type"); break;
         }
+        o->~redisObject();
         if (g_pserver->fActiveReplica) {
             zfree(reinterpret_cast<redisObjectExtended*>(o.unsafe_robjcast())-1);
         } else {
@@ -1141,10 +1143,7 @@ struct redisMemOverhead *getMemoryOverheadData(void) {
         mh->db[mh->num_dbs].overhead_ht_main = mem;
         mem_total+=mem;
         
-        std::unique_lock<fastlock> ul(g_expireLock);
-        mem = db->setexpire()->estimated_bytes_used();
-        mh->db[mh->num_dbs].overhead_ht_expires = mem;
-        mem_total+=mem;
+        mh->db[mh->num_dbs].overhead_ht_expires = 0;
 
         mh->num_dbs++;
     }
@@ -1628,7 +1627,7 @@ robj *deserializeStoredStringObject(const char *data, size_t cb)
     return newObject;
 }
 
-robj *deserializeStoredObjectCore(const void *data, size_t cb)
+robj *deserializeStoredObject(const void *data, size_t cb)
 {
     switch (((char*)data)[0])
     {
@@ -1665,14 +1664,6 @@ robj *deserializeStoredObjectCore(const void *data, size_t cb)
     serverPanic("Unknown object type loading from storage");
 }
 
-robj *deserializeStoredObject(const redisDbPersistentData *db, const char *key, const void *data, size_t cb)
-{
-    robj *o = deserializeStoredObjectCore(data, cb);
-    std::unique_lock<fastlock> ul(g_expireLock);
-    o->SetFExpires(db->setexpire()->exists(key));
-    return o;
-}
-
 sds serializeStoredObject(robj_roptr o, sds sdsPrefix)
 {
     switch (o->type)

src/rdb.cpp

@@ -1237,18 +1237,14 @@ int rdbSaveInfoAuxFields(rio *rdb, int rdbflags, rdbSaveInfo *rsi) {
     return 1;
 }
 
-int saveKey(rio *rdb, const redisDbPersistentDataSnapshot *db, int flags, size_t *processed, const char *keystr, robj_roptr o)
+int saveKey(rio *rdb, int flags, size_t *processed, const char *keystr, robj_roptr o)
 {    
     redisObjectStack key;
 
     initStaticStringObject(key,(char*)keystr);
-    std::unique_lock<fastlock> ul(g_expireLock, std::defer_lock);
     const expireEntry *pexpire = nullptr;
-    if (o->FExpires())
-    {
-        ul.lock();
-        pexpire = db->getExpire(&key);
-        serverAssert((o->FExpires() && pexpire != nullptr) || (!o->FExpires() && pexpire == nullptr));
+    if (o->FExpires()) {
+        pexpire = &o->expire;
     }
 
     if (rdbSaveKeyValuePair(rdb,&key,o,pexpire) == -1)
@@ -1355,7 +1351,7 @@ int rdbSaveRio(rio *rdb, const redisDbPersistentDataSnapshot **rgpdb, int *error
             if (o->FExpires())
                 ++ckeysExpired;
             
-            if (!saveKey(rdb, db, rdbflags, &processed, keystr, o))
+            if (!saveKey(rdb, rdbflags, &processed, keystr, o))
                 return false;
 
             /* Update child info every 1 second (approximately).
@@ -2546,7 +2542,7 @@ robj *rdbLoadObject(int rdbtype, rio *rdb, sds key, int *error, uint64_t mvcc_ts
          * encoding version in the lower 10 bits of the module ID. */
         void *ptr = mt->rdb_load(&io,moduleid&1023);
         if (io.ctx) {
-            moduleFreeContext(io.ctx);
+            moduleFreeContext(io.ctx, false /* propogate */);
             zfree(io.ctx);
         }
 

src/readwritelock.h

@@ -8,38 +8,46 @@ class readWriteLock {
     int m_readCount = 0;
     int m_writeCount = 0;
     bool m_writeWaiting = false;
-    bool m_notify = true;
+    bool m_multi = true;
 public:
     readWriteLock(const char *name) : m_readLock(name), m_writeLock(name) {}
 
     void acquireRead() {
-        std::unique_lock<fastlock> rm(m_readLock);
-        while (m_writeCount > 0 || m_writeWaiting)
-            m_cv.wait(rm);
+        std::unique_lock<fastlock> rm(m_readLock, std::defer_lock);
+        if (m_multi) {
+            rm.lock();
+            while (m_writeCount > 0 || m_writeWaiting)
+                m_cv.wait(rm);
+        }
         m_readCount++;
     }
     
     bool tryAcquireRead() {
         std::unique_lock<fastlock> rm(m_readLock, std::defer_lock);
-        if (!rm.try_lock())
-            return false;
-        if (m_writeCount > 0 || m_writeWaiting)
-            return false;
+        if (m_multi) {
+            if (!rm.try_lock())
+                return false;
+            if (m_writeCount > 0 || m_writeWaiting)
+                return false;
+        }
         m_readCount++;
         return true;
     }
 
     void acquireWrite(bool exclusive = true) {
-        std::unique_lock<fastlock> rm(m_readLock);
-        m_writeWaiting = true;
-        while (m_readCount > 0)
-            m_cv.wait(rm);
-        if (exclusive) {
-            /* Another thread might have the write lock while we have the read lock
-               but won't be able to release it until they can acquire the read lock
-               so release the read lock and try again instead of waiting to avoid deadlock */
-            while(!m_writeLock.try_lock())
+        std::unique_lock<fastlock> rm(m_readLock, std::defer_lock);
+        if (m_multi) {
+            rm.lock();
+            m_writeWaiting = true;
+            while (m_readCount > 0)
                 m_cv.wait(rm);
+            if (exclusive) {
+                /* Another thread might have the write lock while we have the internal lock
+                but won't be able to release it until they can acquire the internal lock
+                so release the internal lock and try again instead of waiting to avoid deadlock */
+                while(!m_writeLock.try_lock())
+                    m_cv.wait(rm);
+            }
         }
         m_writeCount++;
         m_writeWaiting = false;
@@ -52,32 +60,38 @@ public:
 
     bool tryAcquireWrite(bool exclusive = true) {
         std::unique_lock<fastlock> rm(m_readLock, std::defer_lock);
-        if (!rm.try_lock())
-            return false;
-        if (m_readCount > 0)
-            return false;
-        if (exclusive)
-            if (!m_writeLock.try_lock())
+        if (m_multi) {
+            if (!rm.try_lock())
                 return false;
+            if (m_readCount > 0)
+                return false;
+            if (exclusive)
+                if (!m_writeLock.try_lock())
+                    return false;
+        }
         m_writeCount++;
         return true;
     }
 
     void releaseRead() {
-        std::unique_lock<fastlock> rm(m_readLock);
-        m_readCount--;
-        if (m_notify)
+        std::unique_lock<fastlock> rm(m_readLock, std::defer_lock);
+        if (m_multi) {
+            rm.lock();
             m_cv.notify_all();
+        }
+        m_readCount--;
     }
 
     void releaseWrite(bool exclusive = true) {
-        std::unique_lock<fastlock> rm(m_readLock);
+        std::unique_lock<fastlock> rm(m_readLock, std::defer_lock);
         serverAssert(m_writeCount > 0);
-        if (exclusive)
-            m_writeLock.unlock();
-        m_writeCount--;
-        if (m_notify)
+        if (m_multi) {
+            rm.lock();
+            if (exclusive)
+                m_writeLock.unlock();
             m_cv.notify_all();
+        }
+        m_writeCount--;
     }
 
     void downgradeWrite(bool exclusive = true) {
@@ -85,8 +99,8 @@ public:
         acquireRead();
     }
 
-    void setNotify(bool notify) {
-        m_notify = notify;
+    void setMulti(bool multi) {
+        m_multi = multi;
     }
 
     bool hasReader() {

src/redis-cli-cpphelper.cpp

@@ -445,7 +445,7 @@ extern "C" void clusterManagerWaitForClusterJoin(void) {
     int counter = 0,
         check_after = CLUSTER_JOIN_CHECK_AFTER +
                       (int)(listLength(cluster_manager.nodes) * 0.15f);
-    while(!clusterManagerIsConfigConsistent()) {
+    while(!clusterManagerIsConfigConsistent(0 /*fLog*/)) {
         printf(".");
         fflush(stdout);
         sleep(1);
@@ -588,7 +588,7 @@ extern "C" int clusterManagerCheckCluster(int quiet) {
     int do_fix = config.cluster_manager_command.flags &
                  CLUSTER_MANAGER_CMD_FLAG_FIX;
     if (!quiet) clusterManagerShowNodes();
-    consistent = clusterManagerIsConfigConsistent();
+    consistent = clusterManagerIsConfigConsistent(1 /*fLog*/);
     if (!consistent) {
         sds err = sdsnew("[ERR] Nodes don't agree about configuration!");
         clusterManagerOnError(err);

src/redis-cli.c

@@ -1618,6 +1618,8 @@ static int parseOptions(int argc, char **argv) {
                 fprintf(stderr, "Unknown --show-pushes value '%s' "
                         "(valid: '[y]es', '[n]o')\n", argval);
             }
+        } else if (!strcmp(argv[i],"--force")) {
+            config.force_mode = 1;
         } else if (CLUSTER_MANAGER_MODE() && argv[i][0] != '-') {
             if (config.cluster_manager_command.argc == 0) {
                 int j = i + 1;
@@ -1793,6 +1795,7 @@ static void usage(void) {
 "  --verbose          Verbose mode.\n"
 "  --no-auth-warning  Don't show warning message when using password on command\n"
 "                     line interface.\n"
+"  --force            Ignore validation and safety checks\n"
 "  --help             Output this help and exit.\n"
 "  --version          Output version and exit.\n"
 "\n");
@@ -2521,7 +2524,10 @@ cleanup:
 
 static int clusterManagerNodeConnect(clusterManagerNode *node) {
     if (node->context) redisFree(node->context);
-    node->context = redisConnect(node->ip, node->port);
+    struct timeval tv;
+    tv.tv_sec = config.cluster_manager_command.timeout / 1000;
+    tv.tv_usec = (config.cluster_manager_command.timeout % 1000) * 1000;
+    node->context = redisConnectWithTimeout(node->ip, node->port, tv);
     if (!node->context->err && config.tls) {
         const char *err = NULL;
         if (cliSecureConnection(node->context, config.sslconfig, &err) == REDIS_ERR && err) {
@@ -3993,12 +3999,13 @@ cleanup:
     return signature;
 }
 
-int clusterManagerIsConfigConsistent(void) {
+int clusterManagerIsConfigConsistent(int fLog) {
     if (cluster_manager.nodes == NULL) return 0;
     int consistent = (listLength(cluster_manager.nodes) <= 1);
     // If the Cluster has only one node, it's always consistent
     if (consistent) return 1;
     sds first_cfg = NULL;
+    const char *firstNode = NULL;
     listIter li;
     listNode *ln;
     listRewind(cluster_manager.nodes, &li);
@@ -4009,10 +4016,14 @@ int clusterManagerIsConfigConsistent(void) {
             consistent = 0;
             break;
         }
-        if (first_cfg == NULL) first_cfg = cfg;
-        else {
+        if (first_cfg == NULL) {
+            first_cfg = cfg;
+            firstNode = node->name;
+        } else {
             consistent = !sdscmp(first_cfg, cfg);
             sdsfree(cfg);
+            if (fLog && !consistent)
+                clusterManagerLogInfo("\tNode %s (%s:%d) is inconsistent with %s\n", node->name, node->ip, node->port, firstNode);
             if (!consistent) break;
         }
     }
@@ -5161,7 +5172,7 @@ static int clusterManagerCommandReshard(int argc, char **argv) {
     clusterManagerNode *node = clusterManagerNewNode(ip, port);
     if (!clusterManagerLoadInfoFromNode(node, 0)) return 0;
     clusterManagerCheckCluster(0);
-    if (cluster_manager.errors && listLength(cluster_manager.errors) > 0) {
+    if (cluster_manager.errors && listLength(cluster_manager.errors) > 0 && !config.force_mode) {
         fflush(stdout);
         fprintf(stderr,
                 "*** Please fix your cluster problems before resharding\n");
@@ -5394,7 +5405,7 @@ static int clusterManagerCommandRebalance(int argc, char **argv) {
     if (weightedNodes == NULL) goto cleanup;
     /* Check cluster, only proceed if it looks sane. */
     clusterManagerCheckCluster(1);
-    if (cluster_manager.errors && listLength(cluster_manager.errors) > 0) {
+    if (cluster_manager.errors && listLength(cluster_manager.errors) > 0 && !config.force_mode) {
         clusterManagerLogErr("*** Please fix your cluster problems "
                              "before rebalancing\n");
         result = 0;
@@ -5618,7 +5629,10 @@ static int clusterManagerCommandImport(int argc, char **argv) {
     char *reply_err = NULL;
     redisReply *src_reply = NULL;
     // Connect to the source node.
-    redisContext *src_ctx = redisConnect(src_ip, src_port);
+    struct timeval tv;
+    tv.tv_sec = config.cluster_manager_command.timeout / 1000;
+    tv.tv_usec = (config.cluster_manager_command.timeout % 1000) * 1000;
+    redisContext *src_ctx = redisConnectWithTimeout(src_ip, src_port, tv);
     if (src_ctx->err) {
         success = 0;
         fprintf(stderr,"Could not connect to KeyDB at %s:%d: %s.\n", src_ip,
@@ -7185,6 +7199,7 @@ int main(int argc, char **argv) {
     config.set_errcode = 0;
     config.no_auth_warning = 0;
     config.in_multi = 0;
+    config.force_mode = 0;
     config.cluster_manager_command.name = NULL;
     config.cluster_manager_command.argc = 0;
     config.cluster_manager_command.argv = NULL;

src/redis-cli.h

@@ -195,6 +195,7 @@ extern struct config {
     int in_multi;
     int pre_multi_dbnum;
     int quoted_input;   /* Force input args to be treated as quoted strings */
+    int force_mode;
 } config;
 
 struct clusterManager {
@@ -282,7 +283,7 @@ int clusterManagerFixOpenSlot(int slot);
 void clusterManagerPrintSlotsList(list *slots);
 int clusterManagerGetCoveredSlots(char *all_slots);
 void clusterManagerOnError(sds err);
-int clusterManagerIsConfigConsistent(void);
+int clusterManagerIsConfigConsistent(int fLog);
 void freeClusterManagerNode(clusterManagerNode *node);
 void clusterManagerLog(int level, const char* fmt, ...);
 int parseClusterNodeAddress(char *addr, char **ip_ptr, int *port_ptr,

src/replication.cpp

@@ -188,6 +188,8 @@ int bg_unlink(const char *filename) {
 /* ---------------------------------- MASTER -------------------------------- */
 
 bool createDiskBacklog() {
+    if (g_pserver->repl_backlog_disk != nullptr)
+        return true;    // already exists
     // Lets create some disk backed pages and add them here
     std::string path = "./repl-backlog-temp" + std::to_string(gettid());
 #if (defined __APPLE__ || defined __FreeBSD__)
@@ -345,7 +347,8 @@ void freeReplicationBacklog(void) {
         client *c = (client*)listNodeValue(ln);
         serverAssert(c->flags & CLIENT_CLOSE_ASAP || FMasterHost(c));
     }
-    zfree(g_pserver->repl_backlog);
+    if (g_pserver->repl_backlog != g_pserver->repl_backlog_disk)
+        zfree(g_pserver->repl_backlog);
     g_pserver->repl_backlog = NULL;
 }
 
@@ -410,7 +413,7 @@ void feedReplicationBacklog(const void *ptr, size_t len) {
             if (minimumsize > g_pserver->repl_backlog_size && listening_replicas) {
                 // This is an emergency overflow, we better resize to fit
                 long long newsize = std::max(g_pserver->repl_backlog_size*2, minimumsize);
-                serverLog(LL_WARNING, "Replication backlog is too small, resizing to: %lld bytes", newsize);
+                serverLog(LL_WARNING, "Replication backlog is too small, resizing from %lld to %lld bytes", g_pserver->repl_backlog_size, newsize);
                 resizeReplicationBacklog(newsize);
             } else if (!listening_replicas) {
                 // We need to update a few variables or later asserts will notice we dropped data
@@ -1016,8 +1019,6 @@ public:
     void addReplica(client *replica) {
         replicas.push_back(replica);
         replicationSetupSlaveForFullResync(replica,getPsyncInitialOffset());
-        // Optimize the socket for bulk transfer
-        //connDisableTcpNoDelay(replica->conn);
     }
 
     bool isActive() const { return !replicas.empty(); }
@@ -1090,7 +1091,7 @@ public:
         reply->used += size;
     }
 
-    void addLongWithPrefix(long val, char prefix) {
+    void addLongLongWithPrefix(long long val, char prefix) {
         char buf[128];
         int len;
 
@@ -1102,15 +1103,19 @@ public:
     }
 
     void addArrayLen(int len) {
-        addLongWithPrefix(len, '*');
+        addLongLongWithPrefix(len, '*');
     }
 
     void addLong(long val) {
-        addLongWithPrefix(val, ':');
+        addLongLongWithPrefix(val, ':');
+    }
+
+    void addLongLong(long long val) {
+        addLongLongWithPrefix(val, ':');
     }
 
     void addString(const char *s, unsigned long len) {
-        addLongWithPrefix(len, '$');
+        addLongLongWithPrefix(len, '$');
         addData(s, len);
         addData("\r\n", 2);
     }
@@ -1146,22 +1151,19 @@ int rdbSaveSnapshotForReplication(rdbSaveInfo *rsi) {
     // TODO: This needs to be on a background thread
     int retval = C_OK;
     serverAssert(GlobalLocksAcquired());
-    serverLog(LL_NOTICE, "Starting storage provider fast full sync with target: %s", "disk");
+    serverLog(LL_NOTICE, "Starting fast full sync with target: %s", "disk");
 
     std::shared_ptr<replicationBuffer> spreplBuf = std::make_shared<replicationBuffer>();
     listNode *ln;
     listIter li;
-    client *replica = nullptr;
     listRewind(g_pserver->slaves, &li);
-    while (replica == nullptr && (ln = listNext(&li))) {
+    while ((ln = listNext(&li))) {
         client *replicaCur = (client*)listNodeValue(ln);
-        if ((replicaCur->slave_capa & SLAVE_CAPA_ROCKSDB_SNAPSHOT) && (replicaCur->replstate == SLAVE_STATE_WAIT_BGSAVE_START)) {
-            replica = replicaCur;
-            spreplBuf->addReplica(replica);
+        if ((replicaCur->slave_capa & SLAVE_CAPA_KEYDB_FASTSYNC) && (replicaCur->replstate == SLAVE_STATE_WAIT_BGSAVE_START)) {
+            spreplBuf->addReplica(replicaCur);
             replicaCur->replstate = SLAVE_STATE_FASTSYNC_TX;
         }
     }
-    serverAssert(replica != nullptr);
 
     spreplBuf->addArrayLen(2);   // Two sections: Metadata and databases
 
@@ -1176,7 +1178,7 @@ int rdbSaveSnapshotForReplication(rdbSaveInfo *rsi) {
             spreplBuf->addString(rsi->repl_id, CONFIG_RUN_ID_SIZE);
         spreplBuf->addArrayLen(2);
             spreplBuf->addString("repl-offset", 11);
-            spreplBuf->addLong(rsi->master_repl_offset);
+            spreplBuf->addLongLong(rsi->master_repl_offset);
 
     if (dictSize(g_pserver->lua_scripts)) {
         dictEntry *de;
@@ -1192,13 +1194,13 @@ int rdbSaveSnapshotForReplication(rdbSaveInfo *rsi) {
         di = NULL; /* So that we don't release it again on error. */
     }
 
-    std::shared_ptr<std::vector<std::unique_ptr<const StorageCache>>> spvecspsnapshot = std::make_shared<std::vector<std::unique_ptr<const StorageCache>>>();
+    std::shared_ptr<std::vector<const redisDbPersistentDataSnapshot*>> spvecsnapshot = std::make_shared<std::vector<const redisDbPersistentDataSnapshot*>>();
     for (int idb = 0; idb < cserver.dbnum; ++idb) {
-        spvecspsnapshot->emplace_back(g_pserver->db[idb]->CloneStorageCache());
+        spvecsnapshot->emplace_back(g_pserver->db[idb]->createSnapshot(getMvccTstamp(), false));
     }
     aeReleaseLock();
 
-    g_pserver->asyncworkqueue->AddWorkFunction([spreplBuf = std::move(spreplBuf), spvecspsnapshot = std::move(spvecspsnapshot)]{
+    g_pserver->asyncworkqueue->AddWorkFunction([spreplBuf = std::move(spreplBuf), spvecsnapshot = std::move(spvecsnapshot)]{
         int retval = C_OK;
         auto timeStart = ustime();
         auto lastLogTime = timeStart;
@@ -1208,15 +1210,16 @@ int rdbSaveSnapshotForReplication(rdbSaveInfo *rsi) {
         // Databases
         replBuf.addArrayLen(cserver.dbnum);
         for (int idb = 0; idb < cserver.dbnum; ++idb) {
-            auto &spsnapshot = (*spvecspsnapshot)[idb];
-            size_t snapshotDeclaredCount = spsnapshot->count();
+            auto &spsnapshot = (*spvecsnapshot)[idb];
+            size_t snapshotDeclaredCount = spsnapshot->size();
             replBuf.addArrayLen(snapshotDeclaredCount);
             size_t count = 0;
-            bool result = spsnapshot->enumerate([&replBuf, &count, &cbData, &lastLogTime, &cbLastUpdate](const char *rgchKey, size_t cchKey, const void *rgchVal, size_t cchVal) -> bool{
+            bool result = spsnapshot->iterate_threadsafe([&replBuf, &count, &cbData, &lastLogTime, &cbLastUpdate](const char *strKey, robj_roptr o) -> bool{
                 replBuf.addArrayLen(2);
 
-                replBuf.addString(rgchKey, cchKey);
-                replBuf.addString((const char *)rgchVal, cchVal);
+                replBuf.addString(strKey, sdslen(strKey));
+                sds strT = serializeStoredObjectAndExpire(o);
+                replBuf.addString(strT, sdslen(strT));
                 ++count;
                 if ((count % 8092) == 0) {
                     auto curTime = ustime();
@@ -1227,7 +1230,8 @@ int rdbSaveSnapshotForReplication(rdbSaveInfo *rsi) {
                         lastLogTime = ustime();
                     }
                 }
-                cbData += cchKey + cchVal;
+                cbData += sdslen(strKey) + sdslen(strT);
+                sdsfree(strT);
                 return replBuf.isActive();
             });
 
@@ -1299,7 +1303,7 @@ int startBgsaveForReplication(int mincapa) {
     /* Only do rdbSave* when rsiptr is not NULL,
      * otherwise replica will miss repl-stream-db. */
     if (rsiptr) {
-        if (mincapa & SLAVE_CAPA_ROCKSDB_SNAPSHOT && g_pserver->m_pstorageFactory)
+        if (mincapa & SLAVE_CAPA_KEYDB_FASTSYNC && FFastSyncEnabled())
             retval = rdbSaveSnapshotForReplication(rsiptr);
         else if (socket_target)
             retval = rdbSaveToSlavesSockets(rsiptr);
@@ -1478,7 +1482,7 @@ void syncCommand(client *c) {
     }
 
     /* CASE 0: Fast Sync */
-    if ((c->slave_capa & SLAVE_CAPA_ROCKSDB_SNAPSHOT) && g_pserver->m_pstorageFactory) {
+    if (c->slave_capa & SLAVE_CAPA_KEYDB_FASTSYNC && FFastSyncEnabled()) {
         serverLog(LL_NOTICE,"Fast SYNC on next replication cycle");
     /* CASE 1: BGSAVE is in progress, with disk target. */
     } else if (g_pserver->FRdbSaveInProgress() &&
@@ -1669,8 +1673,8 @@ void replconfCommand(client *c) {
                 c->slave_capa |= SLAVE_CAPA_PSYNC2;
             else if (!strcasecmp((const char*)ptrFromObj(c->argv[j+1]), "activeExpire"))
                 c->slave_capa |= SLAVE_CAPA_ACTIVE_EXPIRE;
-            else if (!strcasecmp((const char*)ptrFromObj(c->argv[j+1]), "rocksdb-snapshot-load"))
-                c->slave_capa |= SLAVE_CAPA_ROCKSDB_SNAPSHOT;
+            else if (!strcasecmp((const char*)ptrFromObj(c->argv[j+1]), "keydb-fastsync"))
+                c->slave_capa |= SLAVE_CAPA_KEYDB_FASTSYNC;
 
             fCapaCommand = true;
         } else if (!strcasecmp((const char*)ptrFromObj(c->argv[j]),"ack")) {
@@ -1735,10 +1739,14 @@ void replconfCommand(client *c) {
 
     if (fCapaCommand) {
         sds reply = sdsnew("+OK");
-        if (g_pserver->fActiveReplica)
+        if (g_pserver->fActiveReplica) {
             reply = sdscat(reply, " active-replica");
-        if (g_pserver->m_pstorageFactory && (c->slave_capa & SLAVE_CAPA_ROCKSDB_SNAPSHOT) && !g_pserver->fActiveReplica)
-            reply = sdscat(reply, " rocksdb-snapshot-save");
+        }
+        if ((c->slave_capa & SLAVE_CAPA_KEYDB_FASTSYNC) && FFastSyncEnabled()) {
+            reply = sdscat(reply, " keydb-fastsync-save");
+        } else {
+            c->slave_capa = (c->slave_capa & (~SLAVE_CAPA_KEYDB_FASTSYNC)); // never try to fast sync for this as they won't expect it
+        }
         reply = sdscat(reply, "\r\n");
         addReplySds(c, reply);
     } else {
@@ -2512,6 +2520,7 @@ bool readSnapshotBulkPayload(connection *conn, redisMaster *mi, rdbSaveInfo &rsi
         }
     }
 
+    serverAssert(mi->parseState != nullptr);
     for (int iter = 0; iter < 10; ++iter) {
         if (mi->parseState->shouldThrottle())
             return false;
@@ -2522,11 +2531,16 @@ bool readSnapshotBulkPayload(connection *conn, redisMaster *mi, rdbSaveInfo &rsi
 
         auto nread = connRead(conn, mi->bulkreadBuffer+qblen, readlen);
         if (nread <= 0) {
-            if (connGetState(conn) != CONN_STATE_CONNECTED)
+            if (connGetState(conn) != CONN_STATE_CONNECTED) {
+                serverLog(LL_WARNING,"I/O error trying to sync with MASTER: %s",
+                    (nread == -1) ? strerror(errno) : "connection lost");
                 cancelReplicationHandshake(mi, true);
+            }
             return false;
         }
+        g_pserver->stat_net_input_bytes += nread;
         mi->repl_transfer_lastio = g_pserver->unixtime;
+        mi->repl_transfer_read += nread;
         sdsIncrLen(mi->bulkreadBuffer,nread);
 
         size_t offset = 0;
@@ -2598,8 +2612,9 @@ bool readSnapshotBulkPayload(connection *conn, redisMaster *mi, rdbSaveInfo &rsi
             rsi.repl_stream_db = mi->parseState->getMetaDataLongLong("repl-stream-db");
             rsi.repl_offset = mi->parseState->getMetaDataLongLong("repl-offset");
             sds str = mi->parseState->getMetaDataStr("repl-id");
-            if (sdslen(str) == CONFIG_RUN_ID_SIZE+1) {
+            if (sdslen(str) == CONFIG_RUN_ID_SIZE) {
                 memcpy(rsi.repl_id, str, CONFIG_RUN_ID_SIZE+1);
+                rsi.repl_id_is_set = 1;
             }
 
             fFinished = true;
@@ -2998,7 +3013,7 @@ void readSyncBulkPayload(connection *conn) {
         return;
     }
 
-    if (mi->isRocksdbSnapshotRepl) {
+    if (mi->isKeydbFastsync) {
         if (!readSnapshotBulkPayload(conn, mi, rsi))
             return;
     } else {
@@ -3011,17 +3026,15 @@ void readSyncBulkPayload(connection *conn) {
 
     /* Final setup of the connected slave <- master link */
     replicationCreateMasterClient(mi,mi->repl_transfer_s,rsi.repl_stream_db);
-    if (mi->isRocksdbSnapshotRepl) {
+    if (mi->isKeydbFastsync) {
         /* We need to handle the case where the initial querybuf data was read by fast sync */
         /* This should match the work readQueryFromClient would do for a master client */
         mi->master->querybuf = sdscatsds(mi->master->querybuf, mi->bulkreadBuffer);
+        mi->master->pending_querybuf = sdscatsds(mi->master->pending_querybuf, mi->bulkreadBuffer);
+        mi->master->read_reploff += sdslen(mi->bulkreadBuffer);
+
         sdsfree(mi->bulkreadBuffer);
         mi->bulkreadBuffer = nullptr;
-
-        mi->master->pending_querybuf = sdscatlen(mi->master->pending_querybuf,
-            mi->master->querybuf,sdslen(mi->master->querybuf));
-
-        mi->master->read_reploff += sdslen(mi->master->querybuf);
     }
     mi->repl_transfer_s = nullptr;
     mi->repl_state = REPL_STATE_CONNECTED;
@@ -3060,13 +3073,13 @@ void readSyncBulkPayload(connection *conn) {
     }
 
     /* Send the initial ACK immediately to put this replica in online state. */
-    if (usemark || mi->isRocksdbSnapshotRepl) replicationSendAck(mi);
+    if (usemark || mi->isKeydbFastsync) replicationSendAck(mi);
 
     /* Restart the AOF subsystem now that we finished the sync. This
      * will trigger an AOF rewrite, and when done will start appending
      * to the new file. */
     if (g_pserver->aof_enabled) restartAOFAfterSYNC();
-    if (mi->isRocksdbSnapshotRepl)
+    if (mi->isKeydbFastsync)
         readQueryFromClient(conn); // There may be querybuf data we just appeneded
     return;
 }
@@ -3392,15 +3405,15 @@ void parseMasterCapa(redisMaster *mi, sds strcapa)
     char *pchEnd = szStart;
 
     mi->isActive = false;
-    mi->isRocksdbSnapshotRepl = false;
+    mi->isKeydbFastsync = false;
     for (;;)
     {
         if (*pchEnd == ' ' || *pchEnd == '\0') {
             // Parse the word
             if (strncmp(szStart, "active-replica", pchEnd - szStart) == 0) {
                 mi->isActive = true;
-            } else if (strncmp(szStart, "rocksdb-snapshot-save", pchEnd - szStart) == 0) {
-                mi->isRocksdbSnapshotRepl = true;
+            } else if (strncmp(szStart, "keydb-fastsync-save", pchEnd - szStart) == 0) {
+                mi->isKeydbFastsync = true;
             }
             szStart = pchEnd + 1;
         }
@@ -3547,9 +3560,9 @@ retry_connect:
             "capa","psync2",
             "capa","activeExpire",
         };
-        if (g_pserver->m_pstorageFactory && !g_pserver->fActiveReplica && g_pserver->repl_diskless_load != REPL_DISKLESS_LOAD_SWAPDB) {
+        if (FFastSyncEnabled() && g_pserver->repl_diskless_load != REPL_DISKLESS_LOAD_SWAPDB) {
             veccapabilities.push_back("capa");
-            veccapabilities.push_back("rocksdb-snapshot-load");
+            veccapabilities.push_back("keydb-fastsync");
         }
 
         err = sendCommandArgv(conn, veccapabilities.size(), veccapabilities.data(), nullptr);
@@ -3732,12 +3745,12 @@ retry_connect:
     }
 
     /* Prepare a suitable temp file for bulk transfer */
-    if (!useDisklessLoad()) {
+    if (!useDisklessLoad() && !mi->isKeydbFastsync) {
         while(maxtries--) {
             auto dt = std::chrono::system_clock::now().time_since_epoch();
             auto dtMillisecond = std::chrono::duration_cast<std::chrono::milliseconds>(dt);
             snprintf(tmpfile,sizeof(tmpfile),
-                "temp-%d.%ld.rdb",(int)dtMillisecond.count(),(long int)getpid());
+                "temp-%lld.%ld.rdb",(long long)dtMillisecond.count(),(long int)getpid());
             dfd = open(tmpfile,O_CREAT|O_WRONLY|O_EXCL,0644);
             if (dfd != -1) break;
             sleep(1);
@@ -3861,6 +3874,10 @@ int cancelReplicationHandshake(redisMaster *mi, int reconnect) {
         delete mi->parseState;
         mi->parseState = nullptr;
     }
+    if (mi->bulkreadBuffer) {
+        sdsfree(mi->bulkreadBuffer);
+        mi->bulkreadBuffer = nullptr;
+    }
 
     if (mi->repl_state == REPL_STATE_TRANSFER) {
         replicationAbortSyncTransfer(mi);
@@ -4326,7 +4343,6 @@ void replicationCacheMaster(redisMaster *mi, client *c) {
     if (c->flags & CLIENT_MULTI) discardTransaction(c);
     listEmpty(c->reply);
     c->sentlen = 0;
-    c->sentlenAsync = 0;
     c->reply_bytes = 0;
     c->bufpos = 0;
     resetClient(c);

src/sds.h

@@ -418,7 +418,10 @@ public:
     sdsstring &operator=(const sdsstring &other)
     {
         sdsfree(m_str);
-        m_str = sdsdup(other.m_str);
+        if (other.m_str != nullptr)
+            m_str = sdsdup(other.m_str);
+        else
+            m_str = nullptr;
         return *this;
     }
 

src/server.cpp

@@ -70,6 +70,7 @@
 #ifdef __linux__
 #include <sys/prctl.h>
 #include <sys/mman.h>
+#include <sys/sysinfo.h>
 #endif
 
 int g_fTestMode = false;
@@ -1517,6 +1518,16 @@ dictType dbDictType = {
     dictGCAsyncFree             /* async free destructor */
 };
 
+dictType dbExpiresDictType = {
+        dictSdsHash,                /* hash function */
+        NULL,                       /* key dup */
+        NULL,                       /* val dup */
+        dictSdsKeyCompare,          /* key compare */
+        NULL,                       /* key destructor */
+        NULL,                       /* val destructor */
+        dictExpandAllowed           /* allow to expand */
+    };
+
 /* db->pdict, keys are sds strings, vals are Redis objects. */
 dictType dbTombstoneDictType = {
     dictSdsHash,                /* hash function */
@@ -1549,17 +1560,6 @@ dictType shaScriptObjectDictType = {
     NULL                        /* allow to expand */
 };
 
-/* Db->expires */
-dictType dbExpiresDictType = {
-    dictSdsHash,                /* hash function */
-    NULL,                       /* key dup */
-    NULL,                       /* val dup */
-    dictSdsKeyCompare,          /* key compare */
-    NULL,                       /* key destructor */
-    NULL,                       /* val destructor */
-    dictExpandAllowed           /* allow to expand */
-};
-
 /* Command table. sds string -> command struct pointer. */
 dictType commandTableDictType = {
     dictSdsCaseHash,            /* hash function */
@@ -1870,6 +1870,9 @@ VersionCompareResult compareVersion(SymVer *pver)
     if ((symVerThis.major == 0 && symVerThis.minor == 0 && symVerThis.build == 0)
         || (pver->major == 0 && pver->minor == 0 && pver->build == 0))
         return VersionCompareResult::EqualVersion;
+
+    if (pver->major <= 6 && pver->minor <= 3 && pver->build <= 3)
+        return VersionCompareResult::IncompatibleVersion;
     
     for (int iver = 0; iver < 3; ++iver)
     {
@@ -1958,6 +1961,16 @@ void getExpansiveClientsInfo(size_t *in_usage, size_t *out_usage) {
     *out_usage = o;
 }
 
+int closeClientOnOverload(client *c) {
+    if (g_pserver->overload_closed_clients > MAX_CLIENTS_SHED_PER_PERIOD) return false;
+    if (!g_pserver->is_overloaded) return false;
+    // Don't close masters, replicas, or pub/sub clients
+    if (c->flags & (CLIENT_MASTER | CLIENT_SLAVE | CLIENT_PENDING_WRITE | CLIENT_PUBSUB | CLIENT_BLOCKED)) return false;
+    freeClient(c);
+    ++g_pserver->overload_closed_clients;
+    return true;
+}
+
 /* This function is called by serverCron() and is used in order to perform
  * operations on clients that are important to perform constantly. For instance
  * we use this function in order to disconnect clients after a timeout, including
@@ -2028,6 +2041,7 @@ void clientsCron(int iel) {
             if (clientsCronTrackExpansiveClients(c, curr_peak_mem_usage_slot)) goto LContinue;
             if (clientsCronTrackClientsMemUsage(c)) goto LContinue;
             if (closeClientOnOutputBufferLimitReached(c, 0)) continue; // Client also free'd
+            if (closeClientOnOverload(c)) continue;
         LContinue:
             fastlock_unlock(&c->lock);
         }        
@@ -2123,7 +2137,7 @@ void databasesCron(bool fMainThread) {
                 ::dict *dict = g_pserver->db[rehash_db]->dictUnsafeKeyOnly();
                 /* Are we async rehashing? And if so is it time to re-calibrate? */
                 /* The recalibration limit is a prime number to ensure balancing across threads */
-                if (rehashes_per_ms > 0 && async_rehashes < 131 && !cserver.active_defrag_enabled && cserver.cthreads > 1 && dictSize(dict) > 2048 && dictIsRehashing(dict) && !g_pserver->loading) {
+                if (g_pserver->enable_async_rehash && rehashes_per_ms > 0 && async_rehashes < 131 && !cserver.active_defrag_enabled && cserver.cthreads > 1 && dictSize(dict) > 2048 && dictIsRehashing(dict) && !g_pserver->loading && aeLockContention() > 1) {
                     serverTL->rehashCtl = dictRehashAsyncStart(dict, rehashes_per_ms * ((1000 / g_pserver->hz) / 10));  // Estimate 10% CPU time spent in lock contention
                     if (serverTL->rehashCtl)
                         ++async_rehashes;
@@ -2301,6 +2315,10 @@ void cronUpdateMemoryStats() {
             g_pserver->cron_malloc_stats.allocator_active = g_pserver->cron_malloc_stats.allocator_resident;
         if (!g_pserver->cron_malloc_stats.allocator_allocated)
             g_pserver->cron_malloc_stats.allocator_allocated = g_pserver->cron_malloc_stats.zmalloc_used;
+
+        if (g_pserver->force_eviction_percent) {
+            g_pserver->cron_malloc_stats.sys_available = getMemAvailable();
+        }
     }
 }
 
@@ -2581,6 +2599,26 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) {
         migrateCloseTimedoutSockets();
     }
 
+    /* Check for CPU Overload */
+    run_with_period(10'000) {
+        g_pserver->is_overloaded = false;
+        g_pserver->overload_closed_clients = 0;
+        static clock_t last = 0;
+        if (g_pserver->overload_protect_threshold > 0) {
+            clock_t cur = clock();
+            double perc = static_cast<double>(cur - last) / (CLOCKS_PER_SEC*10);
+            perc /= cserver.cthreads;
+            perc *= 100.0;
+            serverLog(LL_WARNING, "CPU Used: %.2f", perc);
+            if (perc > g_pserver->overload_protect_threshold) {
+                serverLog(LL_WARNING, "\tWARNING: CPU overload detected.");
+                g_pserver->is_overloaded = true;
+            }
+            last = cur;
+        }
+    }
+
+    /* Tune the fastlock to CPU load */
     run_with_period(30000) {
         /* Tune the fastlock to CPU load */
         fastlock_auto_adjust_waits();
@@ -3881,9 +3919,25 @@ void initServer(void) {
     g_pserver->db = (redisDb**)zmalloc(sizeof(redisDb*)*cserver.dbnum, MALLOC_LOCAL);
 
     /* Create the Redis databases, and initialize other internal state. */
-    for (int j = 0; j < cserver.dbnum; j++) {
-        g_pserver->db[j] = new (MALLOC_LOCAL) redisDb();
-        g_pserver->db[j]->initialize(j);
+    if (g_pserver->m_pstorageFactory == nullptr) {
+        for (int j = 0; j < cserver.dbnum; j++) {
+            g_pserver->db[j] = new (MALLOC_LOCAL) redisDb();
+            g_pserver->db[j]->initialize(j);
+        }
+    } else {
+        // Read FLASH metadata and load the appropriate dbid into each databse index, as each DB index can have different dbid mapped due to the swapdb command.
+        g_pserver->metadataDb = g_pserver->m_pstorageFactory->createMetadataDb();
+        for (int idb = 0; idb < cserver.dbnum; ++idb)
+        {
+            int dbid = idb;
+            std::string dbid_key = "db-" + std::to_string(idb);
+            g_pserver->metadataDb->retrieve(dbid_key.c_str(), dbid_key.length(), [&](const char *, size_t, const void *data, size_t){
+                dbid = *(int*)data;
+            });
+
+            g_pserver->db[idb] = new (MALLOC_LOCAL) redisDb();
+            g_pserver->db[idb]->initialize(dbid);
+        }
     }
 
     for (int i = 0; i < MAX_EVENT_LOOPS; ++i)
@@ -3945,8 +3999,6 @@ void initServer(void) {
     g_pserver->pubsub_channels = dictCreate(&keylistDictType,NULL);
     g_pserver->pubsub_patterns = dictCreate(&keylistDictType,NULL);
     g_pserver->cronloops = 0;
-    g_pserver->propagate_in_transaction = 0;
-    g_pserver->client_pause_in_transaction = 0;
     g_pserver->child_pid = -1;
     g_pserver->child_type = CHILD_TYPE_NONE;
     g_pserver->rdbThreadVars.fRdbThreadCancel = false;
@@ -3986,6 +4038,8 @@ void initServer(void) {
     g_pserver->cron_malloc_stats.allocator_allocated = 0;
     g_pserver->cron_malloc_stats.allocator_active = 0;
     g_pserver->cron_malloc_stats.allocator_resident = 0;
+    g_pserver->cron_malloc_stats.sys_available = 0;
+    g_pserver->cron_malloc_stats.sys_total = g_pserver->force_eviction_percent ? getMemTotal() : 0;
     g_pserver->lastbgsave_status = C_OK;
     g_pserver->aof_last_write_status = C_OK;
     g_pserver->aof_last_write_errno = 0;
@@ -3993,6 +4047,7 @@ void initServer(void) {
 
     g_pserver->mvcc_tstamp = 0;
 
+
     /* Create the timer callback, this is our way to process many background
      * operations incrementally, like clients timeout, eviction of unaccessed
      * expired keys and so forth. */
@@ -4033,7 +4088,6 @@ void initServer(void) {
     latencyMonitorInit();
 
     if (g_pserver->m_pstorageFactory) {
-        g_pserver->metadataDb = g_pserver->m_pstorageFactory->createMetadataDb();
         if (g_pserver->metadataDb) {
             g_pserver->metadataDb->retrieve("repl-id", 7, [&](const char *, size_t, const void *data, size_t cb){
                 if (cb == sizeof(g_pserver->replid)) {
@@ -4320,12 +4374,12 @@ void propagate(struct redisCommand *cmd, int dbid, robj **argv, int argc,
      * This way we'll deliver the MULTI/..../EXEC block as a whole and
      * both the AOF and the replication link will have the same consistency
      * and atomicity guarantees. */
-    if (serverTL->in_exec && !g_pserver->propagate_in_transaction)
+    if (serverTL->in_exec && !serverTL->propagate_in_transaction)
         execCommandPropagateMulti(dbid);
 
     /* This needs to be unreachable since the dataset should be fixed during 
      * client pause, otherwise data may be lossed during a failover. */
-    serverAssert(!(areClientsPaused() && !g_pserver->client_pause_in_transaction));
+    serverAssert(!(areClientsPaused() && !serverTL->client_pause_in_transaction));
 
     if (g_pserver->aof_state != AOF_OFF && flags & PROPAGATE_AOF)
         feedAppendOnlyFile(cmd,dbid,argv,argc);
@@ -4647,8 +4701,8 @@ void call(client *c, int flags) {
 
     /* Client pause takes effect after a transaction has finished. This needs
      * to be located after everything is propagated. */
-    if (!serverTL->in_exec && g_pserver->client_pause_in_transaction) {
-        g_pserver->client_pause_in_transaction = 0;
+    if (!serverTL->in_exec && serverTL->client_pause_in_transaction) {
+        serverTL->client_pause_in_transaction = 0;
     }
 
     /* If the client has keys tracking enabled for client side caching,
@@ -4739,8 +4793,9 @@ int processCommand(client *c, int callFlags) {
         /* Both EXEC and EVAL call call() directly so there should be
          * no way in_exec or in_eval or propagate_in_transaction is 1.
          * That is unless lua_timedout, in which case client may run
-         * some commands. */
-        serverAssert(!g_pserver->propagate_in_transaction);
+         * some commands. Also possible that some other thread set
+         * propagate_in_transaction if this is an async command. */
+        serverAssert(!serverTL->propagate_in_transaction);
         serverAssert(!serverTL->in_exec);
         serverAssert(!serverTL->in_eval);
     }
@@ -5037,10 +5092,29 @@ int processCommand(client *c, int callFlags) {
     } else {
         /* If the command was replication or admin related we *must* flush our buffers first.  This is in case
             something happens which would modify what we would send to replicas */
-
         if (c->cmd->flags & (CMD_MODULE | CMD_ADMIN))
             flushReplBacklogToClients();
 
+        if (c->flags & CLIENT_AUDIT_LOGGING){
+            getKeysResult result = GETKEYS_RESULT_INIT;
+            int numkeys = getKeysFromCommand(c->cmd, c->argv, c->argc, &result);
+            int *keyindex = result.keys;
+
+            sds str = sdsempty();
+            for (int j = 0; j < numkeys; j++) {
+                str = sdscatsds(str, (sds)ptrFromObj(c->argv[keyindex[j]]));
+                str = sdscat(str, " ");
+            }
+        
+            if (numkeys > 0)
+            {
+                serverLog(LL_NOTICE, "Audit Log: %s, cmd %s, keys: %s", c->fprint, c->cmd->name, str);
+            } else {
+                serverLog(LL_NOTICE, "Audit Log: %s, cmd %s", c->fprint, c->cmd->name);
+            }
+            sdsfree(str);
+        }
+
         call(c,callFlags);
         c->woff = g_pserver->master_repl_offset;
 
@@ -5588,7 +5662,9 @@ sds genRedisInfoString(const char *section) {
             "configured_hz:%i\r\n"
             "lru_clock:%u\r\n"
             "executable:%s\r\n"
-            "config_file:%s\r\n",
+            "config_file:%s\r\n"
+            "availability_zone:%s\r\n"
+            "features:%s\r\n",
             KEYDB_SET_VERSION,
             redisGitSHA1(),
             strtol(redisGitDirty(),NULL,10) > 0,
@@ -5614,7 +5690,9 @@ sds genRedisInfoString(const char *section) {
             g_pserver->config_hz,
             lruclock,
             cserver.executable ? cserver.executable : "",
-            cserver.configfile ? cserver.configfile : "");
+            cserver.configfile ? cserver.configfile : "",
+            g_pserver->sdsAvailabilityZone,
+            "cluster_mget");
     }
 
     /* Clients */
@@ -5663,6 +5741,7 @@ sds genRedisInfoString(const char *section) {
         const char *evict_policy = evictPolicyToString();
         long long memory_lua = g_pserver->lua ? (long long)lua_gc(g_pserver->lua,LUA_GCCOUNT,0)*1024 : 0;
         struct redisMemOverhead *mh = getMemoryOverheadData();
+        char available_system_mem[64] = "unavailable";
 
         /* Peak memory is updated from time to time by serverCron() so it
          * may happen that the instantaneous value is slightly bigger than
@@ -5671,6 +5750,10 @@ sds genRedisInfoString(const char *section) {
         if (zmalloc_used > g_pserver->stat_peak_memory)
             g_pserver->stat_peak_memory = zmalloc_used;
 
+        if (g_pserver->cron_malloc_stats.sys_available) {
+            snprintf(available_system_mem, 64, "%lu", g_pserver->cron_malloc_stats.sys_available);
+        }
+
         bytesToHuman(hmem,zmalloc_used,sizeof(hmem));
         bytesToHuman(peak_hmem,g_pserver->stat_peak_memory,sizeof(peak_hmem));
         bytesToHuman(total_system_hmem,total_system_mem,sizeof(total_system_hmem));
@@ -5723,7 +5806,8 @@ sds genRedisInfoString(const char *section) {
             "active_defrag_running:%d\r\n"
             "lazyfree_pending_objects:%zu\r\n"
             "lazyfreed_objects:%zu\r\n"
-            "storage_provider:%s\r\n",
+            "storage_provider:%s\r\n"
+            "available_system_memory:%s\r\n",
             zmalloc_used,
             hmem,
             g_pserver->cron_malloc_stats.process_rss,
@@ -5768,18 +5852,10 @@ sds genRedisInfoString(const char *section) {
             g_pserver->active_defrag_running,
             lazyfreeGetPendingObjectsCount(),
             lazyfreeGetFreedObjectsCount(),
-            g_pserver->m_pstorageFactory ? g_pserver->m_pstorageFactory->name() : "none"
+            g_pserver->m_pstorageFactory ? g_pserver->m_pstorageFactory->name() : "none",
+            available_system_mem
         );
         freeMemoryOverheadData(mh);
-
-        if (g_pserver->m_pstorageFactory)
-        {
-            info = sdscatprintf(info, 
-                "%s_memory:%zu\r\n",
-                g_pserver->m_pstorageFactory->name(),
-                g_pserver->m_pstorageFactory->totalDiskspaceUsed()
-            );
-        }
     }
 
     /* Persistence */
@@ -5903,6 +5979,10 @@ sds genRedisInfoString(const char *section) {
                 (intmax_t)eta
             );
         }
+        if (g_pserver->m_pstorageFactory)
+        {
+            info = sdscat(info, g_pserver->m_pstorageFactory->getInfo().get());
+        }
     }
 
     /* Stats */
@@ -7333,7 +7413,7 @@ static void validateConfiguration()
         exit(EXIT_FAILURE);
     }
 
-    g_pserver->repl_backlog_config_size = g_pserver->repl_backlog_size; // this is normally set in the update logic, but not on initial config
+    g_pserver->repl_backlog_size = g_pserver->repl_backlog_config_size; // this is normally set in the update logic, but not on initial config
 }
 
 int iAmMaster(void) {

src/server.h

@@ -122,6 +122,9 @@ typedef long long ustime_t; /* microsecond time type. */
 #define LOADING_BOOT 1
 #define LOADING_REPLICATION 2
 
+#define OVERLOAD_PROTECT_PERIOD_MS 10'000 // 10 seconds
+#define MAX_CLIENTS_SHED_PER_PERIOD (OVERLOAD_PROTECT_PERIOD_MS / 10)  // Restrict to one client per 10ms
+
 extern int g_fTestMode;
 extern struct redisServer *g_pserver;
 
@@ -542,6 +545,7 @@ extern int configOOMScoreAdjValuesDefaults[CONFIG_OOM_COUNT];
 #define CLIENT_REPL_RDBONLY (1ULL<<42) /* This client is a replica that only wants
                                           RDB without replication buffer. */
 #define CLIENT_FORCE_REPLY (1ULL<<44) /* Should addReply be forced to write the text? */
+#define CLIENT_AUDIT_LOGGING (1ULL<<45) /* Client commands required audit logging */
 
 /* Client block type (btype field in client structure)
  * if CLIENT_BLOCKED flag is set. */
@@ -616,7 +620,7 @@ typedef enum {
 #define SLAVE_CAPA_EOF (1<<0)    /* Can parse the RDB EOF streaming format. */
 #define SLAVE_CAPA_PSYNC2 (1<<1) /* Supports PSYNC2 protocol. */
 #define SLAVE_CAPA_ACTIVE_EXPIRE (1<<2) /* Will the slave perform its own expirations? (Don't send delete) */
-#define SLAVE_CAPA_ROCKSDB_SNAPSHOT (1<<3)
+#define SLAVE_CAPA_KEYDB_FASTSYNC (1<<3)
 
 /* Synchronous read timeout - replica side */
 #define CONFIG_REPL_SYNCIO_TIMEOUT 5
@@ -962,6 +966,7 @@ struct redisObjectExtended {
 
 typedef struct redisObject {
     friend redisObject *createEmbeddedStringObject(const char *ptr, size_t len);
+    friend redisObject *createObject(int type, void *ptr);
 protected:
     redisObject() {}
 
@@ -974,6 +979,7 @@ public:
 private:
     mutable std::atomic<unsigned> refcount {0};
 public:
+    expireEntry expire;
     void *m_ptr;
 
     inline bool FExpires() const { return refcount.load(std::memory_order_relaxed) >> 31; }
@@ -984,7 +990,7 @@ public:
     void addref() const { refcount.fetch_add(1, std::memory_order_relaxed); }
     unsigned release() const { return refcount.fetch_sub(1, std::memory_order_seq_cst) & ~(1U << 31); }
 } robj;
-static_assert(sizeof(redisObject) <= 16, "object size is critical, don't increase");
+static_assert(sizeof(redisObject) <= 24, "object size is critical, don't increase");
 
 class redisObjectStack : public redisObjectExtended, public redisObject
 {
@@ -1140,16 +1146,20 @@ public:
 
     dict_iter random();
 
-    const expireEntry &random_expire()
+    const expireEntry *random_expire(sds *key)
     {
-        return m_setexpire->random_value();
+        auto itr = random();
+        if (itr->FExpires()) {
+            *key = itr.key();
+            return &itr->expire;
+        }
+        return nullptr;
     }
 
     dict_iter end()  { return dict_iter(nullptr, nullptr); }
     dict_const_iter end() const { return dict_const_iter(nullptr); }
 
     void getStats(char *buf, size_t bufsize) { dictGetStats(buf, bufsize, m_pdict); }
-    void getExpireStats(char *buf, size_t bufsize) { m_setexpire->getstats(buf, bufsize); }
 
     bool insert(char *k, robj *o, bool fAssumeNew = false, dict_iter *existing = nullptr);
     void tryResize();
@@ -1157,16 +1167,15 @@ public:
     void updateValue(dict_iter itr, robj *val);
     bool syncDelete(robj *key);
     bool asyncDelete(robj *key);
-    size_t expireSize() const { return m_setexpire->size(); }
+    size_t expireSize() const { return m_numexpires; }
     int removeExpire(robj *key, dict_iter itr);
     int removeSubkeyExpire(robj *key, robj *subkey);
-    void resortExpire(expireEntry &e);
     void clear(void(callback)(void*));
     void emptyDbAsync();
     // Note: If you do not need the obj then use the objless iterator version.  It's faster
     bool iterate(std::function<bool(const char*, robj*)> fn);
     void setExpire(robj *key, robj *subkey, long long when);
-    void setExpire(expireEntry &&e);
+    void setExpire(const char *key, expireEntry &&e);
     void initialize();
     void prepOverwriteForSnapshot(char *key);
 
@@ -1190,9 +1199,6 @@ public:
     //  objects stored elsewhere
     dict *dictUnsafeKeyOnly() { return m_pdict; }   
 
-    expireset *setexpireUnsafe() { return m_setexpire; }
-    const expireset *setexpire() const { return m_setexpire; }
-
     const redisDbPersistentDataSnapshot *createSnapshot(uint64_t mvccCheckpoint, bool fOptional);
     void endSnapshot(const redisDbPersistentDataSnapshot *psnapshot);
     void endSnapshotAsync(const redisDbPersistentDataSnapshot *psnapshot);
@@ -1214,6 +1220,8 @@ public:
 
     dict_iter find_cached_threadsafe(const char *key) const;
 
+    static void activeExpireCycleCore(int type);
+
 protected:
     uint64_t m_mvccCheckpoint = 0;
 
@@ -1236,7 +1244,7 @@ private:
     std::shared_ptr<StorageCache> m_spstorage = nullptr;
 
     // Expire
-    expireset *m_setexpire = nullptr;
+    size_t m_numexpires = 0;
 
     // These two pointers are the same, UNLESS the database has been cleared.
     //      in which case m_pdbSnapshot is NULL and we continue as though we weren'
@@ -1306,7 +1314,7 @@ struct redisDb : public redisDbPersistentDataSnapshot
     friend int removeExpire(redisDb *db, robj *key);
     friend void setExpire(struct client *c, redisDb *db, robj *key, robj *subkey, long long when);
     friend void setExpire(client *c, redisDb *db, robj *key, expireEntry &&e);
-    friend int evictionPoolPopulate(int dbid, redisDb *db, expireset *setexpire, struct evictionPoolEntry *pool);
+    friend int evictionPoolPopulate(int dbid, redisDb *db, bool fVolatile, struct evictionPoolEntry *pool);
     friend void activeDefragCycle(void);
     friend void activeExpireCycle(int);
     friend void expireSlaveKeys(void);
@@ -1315,9 +1323,7 @@ struct redisDb : public redisDbPersistentDataSnapshot
     typedef ::dict_const_iter const_iter;
     typedef ::dict_iter iter;
 
-    redisDb()
-        : expireitr(nullptr)
-    {}
+    redisDb() = default;
 
     void initialize(int id);
     void storageProviderInitialize();
@@ -1339,7 +1345,6 @@ struct redisDb : public redisDbPersistentDataSnapshot
     using redisDbPersistentData::random_expire;
     using redisDbPersistentData::end;
     using redisDbPersistentData::getStats;
-    using redisDbPersistentData::getExpireStats;
     using redisDbPersistentData::insert;
     using redisDbPersistentData::tryResize;
     using redisDbPersistentData::incrementallyRehash;
@@ -1357,15 +1362,12 @@ struct redisDb : public redisDbPersistentDataSnapshot
     using redisDbPersistentData::processChanges;
     using redisDbPersistentData::processChangesAsync;
     using redisDbPersistentData::commitChanges;
-    using redisDbPersistentData::setexpireUnsafe;
-    using redisDbPersistentData::setexpire;
     using redisDbPersistentData::endSnapshot;
     using redisDbPersistentData::restoreSnapshot;
     using redisDbPersistentData::removeAllCachedValues;
     using redisDbPersistentData::disableKeyCache;
     using redisDbPersistentData::keycacheIsEnabled;
     using redisDbPersistentData::dictUnsafeKeyOnly;
-    using redisDbPersistentData::resortExpire;
     using redisDbPersistentData::prefetchKeysAsync;
     using redisDbPersistentData::prepOverwriteForSnapshot;
     using redisDbPersistentData::FRehashing;
@@ -1382,7 +1384,7 @@ public:
         return psnapshot;
     }
 
-    expireset::setiter expireitr;
+    unsigned long expires_cursor = 0;
     dict *blocking_keys;        /* Keys with clients waiting for data (BLPOP)*/
     dict *ready_keys;           /* Blocked keys that received a PUSH */
     dict *watched_keys;         /* WATCHED keys for MULTI/EXEC CAS */
@@ -1608,7 +1610,6 @@ struct client {
     unsigned long long reply_bytes; /* Tot bytes of objects in reply list. */
     size_t sentlen;         /* Amount of bytes already sent in the current
                                buffer or object being sent. */
-    size_t sentlenAsync;    /* same as sentlen buf for async buffers (which are a different stream) */
     time_t ctime;           /* Client creation time. */
     long duration;          /* Current command duration. Used for measuring latency of blocking/non-blocking cmds */
     time_t lastinteraction; /* Time of the last interaction, used for timeout */
@@ -1710,6 +1711,7 @@ struct client {
     size_t argv_len_sum() const;
     bool asyncCommand(std::function<void(const redisDbPersistentDataSnapshot *, const std::vector<robj_sharedptr> &)> &&mainFn, 
                         std::function<void(const redisDbPersistentDataSnapshot *)> &&postFn = nullptr);
+    char* fprint;
 };
 
 struct saveparam {
@@ -1868,7 +1870,7 @@ struct redisMaster {
     long long master_initial_offset;           /* Master PSYNC offset. */
 
     bool isActive = false;
-    bool isRocksdbSnapshotRepl = false;
+    bool isKeydbFastsync = false;
     int repl_state;          /* Replication status if the instance is a replica */
     off_t repl_transfer_size; /* Size of RDB to read from master during sync. */
     off_t repl_transfer_read; /* Amount of RDB read from master during sync. */
@@ -2009,6 +2011,8 @@ struct malloc_stats {
     size_t allocator_allocated;
     size_t allocator_active;
     size_t allocator_resident;
+    size_t sys_total;
+    size_t sys_available;
 };
 
 typedef struct socketFds {
@@ -2199,6 +2203,9 @@ struct redisServerThreadVars {
     bool modulesEnabledThisAeLoop = false; /* In this loop of aeMain, were modules enabled before 
                                               the thread went to sleep? */
     bool disable_async_commands = false; /* this is only valid for one cycle of the AE loop and is reset in afterSleep */
+    
+    int propagate_in_transaction = 0;  /* Make sure we don't propagate nested MULTI/EXEC */
+    int client_pause_in_transaction = 0; /* Was a client pause executed during this Exec? */
     std::vector<client*> vecclientsProcess;
     dictAsyncRehashCtl *rehashCtl = nullptr;
 
@@ -2237,7 +2244,6 @@ struct redisServerConst {
     int maxidletime;                /* Client timeout in seconds */
     int tcpkeepalive;               /* Set SO_KEEPALIVE if non-zero. */
     int active_expire_enabled;      /* Can be disabled for testing purposes. */
-    int active_expire_effort;       /* From 1 (default) to 10, active effort. */
     int active_defrag_enabled;
     int jemalloc_bg_thread;         /* Enable jemalloc background thread */
     size_t active_defrag_ignore_bytes; /* minimum amount of fragmentation waste to start active defrag */
@@ -2299,14 +2305,13 @@ struct redisServer {
     rax *errors;                /* Errors table */
     int activerehashing;        /* Incremental rehash in serverCron() */
     int active_defrag_running;  /* Active defragmentation running (holds current scan aggressiveness) */
+    int enable_async_rehash = 1;    /* Should we use the async rehash feature? */
     int cronloops;              /* Number of times the cron function run */
     char runid[CONFIG_RUN_ID_SIZE+1];  /* ID always different at every exec. */
     int sentinel_mode;          /* True if this instance is a Sentinel. */
     size_t initial_memory_usage; /* Bytes used after initialization. */
     int always_show_logo;       /* Show logo even for non-stdout logging. */
-    int propagate_in_transaction;  /* Make sure we don't propagate nested MULTI/EXEC */
     char *ignore_warnings;      /* Config: warnings that should be ignored. */
-    int client_pause_in_transaction; /* Was a client pause executed during this Exec? */
     pause_type client_pause_type;      /* True if clients are currently paused */
     /* Modules */
     ::dict *moduleapi;            /* Exported core APIs dictionary for modules. */
@@ -2349,6 +2354,7 @@ struct redisServer {
     unsigned int loading_process_events_interval_keys;
 
     int active_expire_enabled;      /* Can be disabled for testing purposes. */
+    int active_expire_effort;       /* From 1 (default) to 10, active effort. */
 
     int replicaIsolationFactor = 1;
 
@@ -2564,11 +2570,13 @@ struct redisServer {
     int get_ack_from_slaves;            /* If true we send REPLCONF GETACK. */
     /* Limits */
     unsigned int maxclients;            /* Max number of simultaneous clients */
+    unsigned int maxclientsReserved;    /* Reserved amount for health checks (localhost conns) */
     unsigned long long maxmemory;   /* Max number of memory bytes to use */
     unsigned long long maxstorage;  /* Max number of bytes to use in a storage provider */
     int maxmemory_policy;           /* Policy for key eviction */
     int maxmemory_samples;          /* Precision of random sampling */
     int maxmemory_eviction_tenacity;/* Aggressiveness of eviction processing */
+    int force_eviction_percent;     /* Force eviction when this percent of system memory is remaining */
     int lfu_log_factor;             /* LFU logarithmic counter factor. */
     int lfu_decay_time;             /* LFU counter decay factor. */
     long long proto_max_bulk_len;   /* Protocol bulk length maximum size. */
@@ -2679,6 +2687,7 @@ struct redisServer {
 
     int fActiveReplica;                          /* Can this replica also be a master? */
     int fWriteDuringActiveLoad;                  /* Can this active-replica write during an RDB load? */
+    int fEnableFastSync = false;
 
     // Format:
     //  Lower 20 bits: a counter incrementing for each command executed in the same millisecond
@@ -2703,6 +2712,7 @@ struct redisServer {
     int tls_auth_clients;
     int tls_rotation;
 
+    std::set<sdsstring> tls_auditlog_blocklist; /* Certificates that can be excluded from audit logging */
     std::set<sdsstring> tls_allowlist;
     redisTLSContextConfig tls_ctx_config;
 
@@ -2743,6 +2753,12 @@ struct redisServer {
     uint16_t rglockSamples[s_lockContentionSamples];
     unsigned ilockRingHead = 0;
 
+
+    sds sdsAvailabilityZone;
+    int overload_protect_threshold = 0;
+    int is_overloaded = 0;
+    int overload_closed_clients = 0;
+
         int module_blocked_pipe[2]; /* Pipe used to awake the event loop if a
                             client blocked on a module command needs
                             to be processed. */
@@ -2857,6 +2873,12 @@ typedef struct {
 #define OBJ_HASH_KEY 1
 #define OBJ_HASH_VALUE 2
 
+/* Used in evict.cpp */
+enum class EvictReason {
+    User,       /* User memory exceeded limit */
+    System      /* System memory exceeded limit */
+};
+
 /*-----------------------------------------------------------------------------
  * Extern declarations
  *----------------------------------------------------------------------------*/
@@ -2897,7 +2919,7 @@ int moduleGetCommandKeysViaAPI(struct redisCommand *cmd, robj **argv, int argc,
 moduleType *moduleTypeLookupModuleByID(uint64_t id);
 void moduleTypeNameByID(char *name, uint64_t moduleid);
 const char *moduleTypeModuleName(moduleType *mt);
-void moduleFreeContext(struct RedisModuleCtx *ctx);
+void moduleFreeContext(struct RedisModuleCtx *ctx, bool propogate = true);
 void unblockClientFromModule(client *c);
 void moduleHandleBlockedClients(int iel);
 void moduleBlockedClientTimedOut(client *c);
@@ -3157,9 +3179,10 @@ int equalStringObjects(robj *a, robj *b);
 unsigned long long estimateObjectIdleTime(robj_roptr o);
 void trimStringObjectIfNeeded(robj *o);
 
-robj *deserializeStoredObject(const redisDbPersistentData *db, const char *key, const void *data, size_t cb);
-std::unique_ptr<expireEntry> deserializeExpire(sds key, const char *str, size_t cch, size_t *poffset);
+robj *deserializeStoredObject(const void *data, size_t cb);
+std::unique_ptr<expireEntry> deserializeExpire(const char *str, size_t cch, size_t *poffset);
 sds serializeStoredObject(robj_roptr o, sds sdsPrefix = nullptr);
+sds serializeStoredObjectAndExpire(robj_roptr o);
 
 #define sdsEncodedObject(objptr) (objptr->encoding == OBJ_ENCODING_RAW || objptr->encoding == OBJ_ENCODING_EMBSTR)
 
@@ -3361,7 +3384,7 @@ int zslLexValueGteMin(sds value, zlexrangespec *spec);
 int zslLexValueLteMax(sds value, zlexrangespec *spec);
 
 /* Core functions */
-int getMaxmemoryState(size_t *total, size_t *logical, size_t *tofree, float *level, bool fQuickCycle = false, bool fPreSnapshot=false);
+int getMaxmemoryState(size_t *total, size_t *logical, size_t *tofree, float *level, EvictReason *reason=nullptr, bool fQuickCycle=false, bool fPreSnapshot=false);
 size_t freeMemoryGetNotCountedMemory();
 int overMaxmemoryAfterAlloc(size_t moremem);
 int processCommand(client *c, int callFlags);
@@ -3646,6 +3669,9 @@ unsigned long LFUDecrAndReturn(robj_roptr o);
 #define EVICT_FAIL 2
 int performEvictions(bool fPreSnapshot);
 
+/* meminfo.cpp -- get memory info from /proc/memoryinfo for linux distros */
+size_t getMemAvailable();
+size_t getMemTotal();
 
 /* Keys hashing / comparison functions for dict.c hash tables. */
 uint64_t dictSdsHash(const void *key);
@@ -3898,7 +3924,7 @@ void updateActiveReplicaMastersFromRsi(rdbSaveInfo *rsi);
 uint64_t getMvccTstamp();
 void incrementMvccTstamp();
 
-#if __GNUC__ >= 7 && !defined(NO_DEPRECATE_FREE)
+#if __GNUC__ >= 7 && !defined(NO_DEPRECATE_FREE) && !defined(ALPINE)
  [[deprecated]]
 void *calloc(size_t count, size_t size) noexcept;
  [[deprecated]]
@@ -3946,6 +3972,10 @@ inline int ielFromEventLoop(const aeEventLoop *eventLoop)
     return iel;
 }
 
+inline bool FFastSyncEnabled() {
+    return g_pserver->fEnableFastSync && !g_pserver->fActiveReplica;
+}
+
 inline int FCorrectThread(client *c)
 {
     return (c->conn == nullptr)

src/snapshot.cpp

@@ -74,6 +74,7 @@ const redisDbPersistentDataSnapshot *redisDbPersistentData::createSnapshot(uint6
     spdb->m_fTrackingChanges = 0;
     spdb->m_pdict = m_pdict;
     spdb->m_pdictTombstone = m_pdictTombstone;
+    spdb->m_numexpires = m_numexpires;
     // Add a fake iterator so the dicts don't rehash (they need to be read only)
     dictPauseRehashing(spdb->m_pdict);
     dictForceRehash(spdb->m_pdictTombstone);    // prevent rehashing by finishing the rehash now
@@ -83,12 +84,6 @@ const redisDbPersistentDataSnapshot *redisDbPersistentData::createSnapshot(uint6
     spdb->m_pdbSnapshot = m_pdbSnapshot;
     spdb->m_refCount = 1;
     spdb->m_mvccCheckpoint = getMvccTstamp();
-    if (m_setexpire != nullptr)
-    {
-        std::unique_lock<fastlock> ul(g_expireLock);
-        spdb->m_setexpire =  new (MALLOC_LOCAL) expireset(*m_setexpire);
-        spdb->m_setexpire->pause_rehash();  // needs to be const
-    }
 
     if (dictIsRehashing(spdb->m_pdict) || dictIsRehashing(spdb->m_pdictTombstone)) {
         serverLog(LL_VERBOSE, "NOTICE: Suboptimal snapshot");
@@ -171,11 +166,6 @@ void redisDbPersistentData::restoreSnapshot(const redisDbPersistentDataSnapshot
     size_t expectedSize = psnapshot->size();
     dictEmpty(m_pdict, nullptr);
     dictEmpty(m_pdictTombstone, nullptr);
-    {
-    std::unique_lock<fastlock> ul(g_expireLock);
-    delete m_setexpire;
-    m_setexpire = new (MALLOC_LOCAL) expireset(*psnapshot->m_setexpire);
-    }
     endSnapshot(psnapshot);
     serverAssert(size() == expectedSize);
 }
@@ -597,8 +587,12 @@ bool redisDbPersistentDataSnapshot::iterate_threadsafe_core(std::function<bool(c
                 if (!fKeyOnly)
                 {
                     size_t offset = 0;
-                    deserializeExpire(sdsKey, (const char*)data, cbData, &offset);
-                    o = deserializeStoredObject(this, sdsKey, reinterpret_cast<const char*>(data)+offset, cbData-offset);
+                    std::unique_ptr<expireEntry> spexpire = deserializeExpire((const char*)data, cbData, &offset);
+                    o = deserializeStoredObject(reinterpret_cast<const char*>(data)+offset, cbData-offset);
+                    o->SetFExpires(spexpire != nullptr);
+                    if (spexpire != nullptr) {
+                        o->expire = std::move(*spexpire);
+                    }
                 }
                 fContinue = fn(sdsKey, o);
                 if (o != nullptr)

src/storage/rocksdb.cpp

@@ -7,6 +7,8 @@
 #include "../cluster.h"
 #include "rocksdbfactor_internal.h"
 
+template class std::basic_string<char>;
+
 static const char keyprefix[] = INTERNAL_KEY_PREFIX;
 
 rocksdb::Options DefaultRocksDBOptions();
@@ -24,8 +26,9 @@ bool FInternalKey(const char *key, size_t cch)
 
 std::string getPrefix(unsigned int hashslot)
 {
-    char *hash_char = (char *)&hashslot;
-    return std::string(hash_char + (sizeof(unsigned int) - 2), 2);
+    HASHSLOT_PREFIX_TYPE slot = HASHSLOT_PREFIX_ENDIAN((HASHSLOT_PREFIX_TYPE)hashslot);
+    char *hash_char = (char *)&slot;
+    return std::string(hash_char, HASHSLOT_PREFIX_BYTES);
 }
 
 std::string prefixKey(const char *key, size_t cchKey)
@@ -33,8 +36,8 @@ std::string prefixKey(const char *key, size_t cchKey)
     return FInternalKey(key, cchKey) ? std::string(key, cchKey) : getPrefix(keyHashSlot(key, cchKey)) + std::string(key, cchKey);
 }
 
-RocksDBStorageProvider::RocksDBStorageProvider(RocksDBStorageFactory *pfactory, std::shared_ptr<rocksdb::DB> &spdb, std::shared_ptr<rocksdb::ColumnFamilyHandle> &spcolfam, const rocksdb::Snapshot *psnapshot, size_t count)
-    : m_pfactory(pfactory), m_spdb(spdb), m_psnapshot(psnapshot), m_spcolfamily(spcolfam), m_count(count)
+RocksDBStorageProvider::RocksDBStorageProvider(RocksDBStorageFactory *pfactory, std::shared_ptr<rocksdb::DB> &spdb, std::shared_ptr<rocksdb::ColumnFamilyHandle> &spcolfam, std::shared_ptr<rocksdb::ColumnFamilyHandle> &spexpirecolfam, const rocksdb::Snapshot *psnapshot, size_t count)
+    : m_pfactory(pfactory), m_spdb(spdb), m_psnapshot(psnapshot), m_spcolfamily(spcolfam), m_spexpirecolfamily(spexpirecolfam), m_count(count)
 {
     m_readOptionsTemplate = rocksdb::ReadOptions();
     m_readOptionsTemplate.verify_checksums = false;
@@ -144,16 +147,28 @@ void RocksDBStorageProvider::retrieve(const char *key, size_t cchKey, callbackSi
 size_t RocksDBStorageProvider::clear()
 {
     size_t celem = count();
+    auto options = m_spdb->GetOptions(m_spcolfamily.get());
     auto status = m_spdb->DropColumnFamily(m_spcolfamily.get());
     auto strName = m_spcolfamily->GetName();
 
     rocksdb::ColumnFamilyHandle *handle = nullptr;
-    rocksdb::ColumnFamilyOptions cf_options(m_pfactory->RocksDbOptions());
+    rocksdb::ColumnFamilyOptions cf_options(options);
+
     m_spdb->CreateColumnFamily(cf_options, strName, &handle);
     m_spcolfamily = std::shared_ptr<rocksdb::ColumnFamilyHandle>(handle);
 
     if (!status.ok())
         throw status.ToString();
+   
+    status = m_spdb->DropColumnFamily(m_spexpirecolfamily.get());
+    strName = m_spexpirecolfamily->GetName();
+
+    m_spdb->CreateColumnFamily(cf_options, strName, &handle);
+    m_spexpirecolfamily = std::shared_ptr<rocksdb::ColumnFamilyHandle>(handle);
+
+    if (!status.ok())
+        throw status.ToString();
+
     m_count = 0;
     return celem;
 }
@@ -172,7 +187,7 @@ bool RocksDBStorageProvider::enumerate(callback fn) const
         if (FInternalKey(it->key().data(), it->key().size()))
             continue;
         ++count;
-        bool fContinue = fn(it->key().data()+2, it->key().size()-2, it->value().data(), it->value().size());
+        bool fContinue = fn(it->key().data()+HASHSLOT_PREFIX_BYTES, it->key().size()-HASHSLOT_PREFIX_BYTES, it->value().data(), it->value().size());
         if (!fContinue)
             break;
     }
@@ -191,17 +206,17 @@ bool RocksDBStorageProvider::enumerate_hashslot(callback fn, unsigned int hashsl
     std::string prefix = getPrefix(hashslot);
     std::unique_ptr<rocksdb::Iterator> it = std::unique_ptr<rocksdb::Iterator>(m_spdb->NewIterator(ReadOptions(), m_spcolfamily.get()));
     size_t count = 0;
-    for (it->Seek(prefix.c_str()); it->Valid(); it->Next()) {
+    for (it->Seek(prefix); it->Valid(); it->Next()) {
         if (FInternalKey(it->key().data(), it->key().size()))
             continue;
-        if (strncmp(it->key().data(),prefix.c_str(),2) != 0)
+        if (HASHSLOT_PREFIX_RECOVER(*(HASHSLOT_PREFIX_TYPE *)it->key().data()) != hashslot)
             break;
         ++count;
-        bool fContinue = fn(it->key().data()+2, it->key().size()-2, it->value().data(), it->value().size());
+        bool fContinue = fn(it->key().data()+HASHSLOT_PREFIX_BYTES, it->key().size()-HASHSLOT_PREFIX_BYTES, it->value().data(), it->value().size());
         if (!fContinue)
             break;
     }
-    bool full_iter = !it->Valid() || (strncmp(it->key().data(),prefix.c_str(),2) != 0);
+    bool full_iter = !it->Valid() || (HASHSLOT_PREFIX_RECOVER(*(HASHSLOT_PREFIX_TYPE *)it->key().data()) != hashslot);
     if (full_iter && count != g_pserver->cluster->slots_keys_count[hashslot])
     {
         printf("WARNING: rocksdb hashslot count mismatch");
@@ -211,11 +226,81 @@ bool RocksDBStorageProvider::enumerate_hashslot(callback fn, unsigned int hashsl
     return full_iter;
 }
 
+void RocksDBStorageProvider::setExpire(const char *key, size_t cchKey, long long expire)
+{
+    rocksdb::Status status;
+    std::unique_lock<fastlock> l(m_lock);
+    long long beExpire = htobe64(expire);
+    std::string prefix((const char *)&beExpire,sizeof(long long));
+    std::string strKey(key, cchKey);
+    if (m_spbatch != nullptr)
+        status = m_spbatch->Put(m_spexpirecolfamily.get(), rocksdb::Slice(prefix + strKey), rocksdb::Slice(strKey));
+    else
+        status = m_spdb->Put(WriteOptions(), m_spexpirecolfamily.get(), rocksdb::Slice(prefix + strKey), rocksdb::Slice(strKey));
+    if (!status.ok())
+        throw status.ToString();
+}
+
+void RocksDBStorageProvider::removeExpire(const char *key, size_t cchKey, long long expire)
+{
+    rocksdb::Status status;
+    std::unique_lock<fastlock> l(m_lock);
+    long long beExpire = htobe64(expire);
+    std::string prefix((const char *)&beExpire,sizeof(long long));
+    std::string strKey(key, cchKey);
+    std::string fullKey = prefix + strKey;
+    if (!FExpireExists(fullKey))
+        return;
+    if (m_spbatch)
+        status = m_spbatch->Delete(m_spexpirecolfamily.get(), rocksdb::Slice(fullKey));
+    else
+        status = m_spdb->Delete(WriteOptions(), m_spexpirecolfamily.get(), rocksdb::Slice(fullKey));
+    if (!status.ok())
+        throw status.ToString();
+}
+
+std::vector<std::string> RocksDBStorageProvider::getExpirationCandidates(unsigned int count)
+{
+    std::vector<std::string> result;
+    std::unique_ptr<rocksdb::Iterator> it = std::unique_ptr<rocksdb::Iterator>(m_spdb->NewIterator(ReadOptions(), m_spexpirecolfamily.get()));
+    for (it->SeekToFirst(); it->Valid() && result.size() < count; it->Next()) {
+        if (FInternalKey(it->key().data(), it->key().size()))
+            continue;
+        result.emplace_back(it->value().data(), it->value().size());
+    }
+    return result;
+}
+
+std::string randomHashSlot() {
+    return getPrefix(genrand64_int63() % (1 << 16));
+}
+
+std::vector<std::string> RocksDBStorageProvider::getEvictionCandidates(unsigned int count)
+{
+    std::vector<std::string> result;
+    if (g_pserver->maxmemory_policy & MAXMEMORY_FLAG_ALLKEYS) {
+        std::unique_ptr<rocksdb::Iterator> it = std::unique_ptr<rocksdb::Iterator>(m_spdb->NewIterator(ReadOptions(), m_spcolfamily.get()));
+        for (it->Seek(randomHashSlot()); it->Valid() && result.size() < count; it->Next()) {
+            if (FInternalKey(it->key().data(), it->key().size()))
+                continue;
+            result.emplace_back(it->key().data() + HASHSLOT_PREFIX_BYTES, it->key().size() - HASHSLOT_PREFIX_BYTES);
+        }
+    } else {
+        std::unique_ptr<rocksdb::Iterator> it = std::unique_ptr<rocksdb::Iterator>(m_spdb->NewIterator(ReadOptions(), m_spexpirecolfamily.get()));
+        for (it->SeekToFirst(); it->Valid() && result.size() < count; it->Next()) {
+            if (FInternalKey(it->key().data(), it->key().size()))
+                continue;
+            result.emplace_back(it->value().data(), it->value().size());
+        }
+    }
+    return result;
+}
+
 const IStorage *RocksDBStorageProvider::clone() const
 {
     std::unique_lock<fastlock> l(m_lock);
     const rocksdb::Snapshot *psnapshot = const_cast<RocksDBStorageProvider*>(this)->m_spdb->GetSnapshot();
-    return new RocksDBStorageProvider(m_pfactory, const_cast<RocksDBStorageProvider*>(this)->m_spdb, const_cast<RocksDBStorageProvider*>(this)->m_spcolfamily, psnapshot, m_count);
+    return new RocksDBStorageProvider(m_pfactory, const_cast<RocksDBStorageProvider*>(this)->m_spdb, const_cast<RocksDBStorageProvider*>(this)->m_spcolfamily, const_cast<RocksDBStorageProvider*>(this)->m_spexpirecolfamily, psnapshot, m_count);
 }
 
 RocksDBStorageProvider::~RocksDBStorageProvider()
@@ -268,6 +353,7 @@ void RocksDBStorageProvider::batch_unlock()
 void RocksDBStorageProvider::flush()
 {
     m_spdb->SyncWAL();
+    m_spdb->Flush(rocksdb::FlushOptions());
 }
 
 bool RocksDBStorageProvider::FKeyExists(std::string& key) const
@@ -276,4 +362,12 @@ bool RocksDBStorageProvider::FKeyExists(std::string& key) const
     if (m_spbatch)
         return m_spbatch->GetFromBatchAndDB(m_spdb.get(), ReadOptions(), m_spcolfamily.get(), rocksdb::Slice(key), &slice).ok();
     return m_spdb->Get(ReadOptions(), m_spcolfamily.get(), rocksdb::Slice(key), &slice).ok();
+}
+
+bool RocksDBStorageProvider::FExpireExists(std::string& key) const
+{
+    rocksdb::PinnableSlice slice;
+    if (m_spbatch)
+        return m_spbatch->GetFromBatchAndDB(m_spdb.get(), ReadOptions(), m_spexpirecolfamily.get(), rocksdb::Slice(key), &slice).ok();
+    return m_spdb->Get(ReadOptions(), m_spexpirecolfamily.get(), rocksdb::Slice(key), &slice).ok();
 }

src/storage/rocksdb.h

@@ -4,12 +4,25 @@
 #include "../IStorage.h"
 #include <rocksdb/db.h>
 #include <rocksdb/utilities/write_batch_with_index.h>
+#ifdef __APPLE__
+#include <libkern/OSByteOrder.h>
+#define htole16 OSSwapHostToLittleInt16
+#define le16toh OSSwapLittleToHostInt16
+#define htobe64 OSSwapHostToBigInt64
+#else
+#include <endian.h>
+#endif
 #include "../fastlock.h"
 
 #define INTERNAL_KEY_PREFIX "\x00\x04\x03\x00\x05\x02\x04"
+#define HASHSLOT_PREFIX_TYPE uint16_t
+#define HASHSLOT_PREFIX_BYTES sizeof(HASHSLOT_PREFIX_TYPE)
+#define HASHSLOT_PREFIX_ENDIAN htole16
+#define HASHSLOT_PREFIX_RECOVER le16toh
 static const char count_key[] = INTERNAL_KEY_PREFIX "__keydb__count\1";
 static const char version_key[] = INTERNAL_KEY_PREFIX "__keydb__version\1";
 static const char meta_key[] = INTERNAL_KEY_PREFIX "__keydb__metadata\1";
+static const char last_expire_key[] = INTERNAL_KEY_PREFIX "__keydb__last_expire_time";
 class RocksDBStorageFactory;
 
 class RocksDBStorageProvider : public IStorage
@@ -19,12 +32,13 @@ class RocksDBStorageProvider : public IStorage
     std::unique_ptr<rocksdb::WriteBatchWithIndex> m_spbatch;
     const rocksdb::Snapshot *m_psnapshot = nullptr;
     std::shared_ptr<rocksdb::ColumnFamilyHandle> m_spcolfamily;
+    std::shared_ptr<rocksdb::ColumnFamilyHandle> m_spexpirecolfamily;
     rocksdb::ReadOptions m_readOptionsTemplate;
     size_t m_count = 0;
     mutable fastlock m_lock {"RocksDBStorageProvider"};
 
 public:
-    RocksDBStorageProvider(RocksDBStorageFactory *pfactory, std::shared_ptr<rocksdb::DB> &spdb, std::shared_ptr<rocksdb::ColumnFamilyHandle> &spcolfam, const rocksdb::Snapshot *psnapshot, size_t count);
+    RocksDBStorageProvider(RocksDBStorageFactory *pfactory, std::shared_ptr<rocksdb::DB> &spdb, std::shared_ptr<rocksdb::ColumnFamilyHandle> &spcolfam, std::shared_ptr<rocksdb::ColumnFamilyHandle> &spexpirecolfam, const rocksdb::Snapshot *psnapshot, size_t count);
     ~RocksDBStorageProvider();
 
     virtual void insert(const char *key, size_t cchKey, void *data, size_t cb, bool fOverwrite) override;
@@ -34,6 +48,11 @@ public:
     virtual bool enumerate(callback fn) const override;
     virtual bool enumerate_hashslot(callback fn, unsigned int hashslot) const override;
 
+    virtual std::vector<std::string> getExpirationCandidates(unsigned int count) override;
+    virtual std::vector<std::string> getEvictionCandidates(unsigned int count) override;
+    virtual void setExpire(const char *key, size_t cchKey, long long expire) override;
+    virtual void removeExpire(const char *key, size_t cchKey, long long expire) override;
+
     virtual const IStorage *clone() const override;
 
     virtual void beginWriteBatch() override;
@@ -50,6 +69,7 @@ public:
 
 protected:
     bool FKeyExists(std::string&) const;
+    bool FExpireExists(std::string&) const;
 
     const rocksdb::ReadOptions &ReadOptions() const { return m_readOptionsTemplate; }
     rocksdb::WriteOptions WriteOptions() const;

src/storage/rocksdbfactor_internal.h

@@ -5,6 +5,7 @@ class RocksDBStorageFactory : public IStorageFactory
 {
     std::shared_ptr<rocksdb::DB> m_spdb;    // Note: This must be first so it is deleted last
     std::vector<std::unique_ptr<rocksdb::ColumnFamilyHandle>> m_vecspcols;
+    std::vector<std::unique_ptr<rocksdb::ColumnFamilyHandle>> m_vecspexpirecols;
     std::shared_ptr<rocksdb::SstFileManager> m_pfilemanager;
     std::string m_path;
     bool m_fCreatedTempFolder = false;
@@ -18,6 +19,7 @@ public:
     virtual const char *name() const override;
 
     virtual size_t totalDiskspaceUsed() const override;
+    virtual sdsstring getInfo() const override;
 
     virtual bool FSlow() const override { return true; }
 

src/storage/rocksdbfactory.cpp

@@ -9,6 +9,7 @@
 #include "rocksdbfactor_internal.h"
 #include <sys/types.h>
 #include <sys/stat.h> 
+#include <sys/statvfs.h>
 
 rocksdb::Options DefaultRocksDBOptions() {
     rocksdb::Options options;
@@ -60,8 +61,8 @@ RocksDBStorageFactory::RocksDBStorageFactory(const char *dbfile, int dbnum, cons
     auto status = rocksdb::DB::ListColumnFamilies(rocksdb::Options(), dbfile, &vecT);
     // RocksDB requires we know the count of col families before opening, if the user only wants to see less
     //  we still have to make room for all column family handles regardless
-    if (status.ok() && (int)vecT.size() > dbnum)
-        dbnum = (int)vecT.size();
+    if (status.ok() && (int)vecT.size()/2 > dbnum)
+        dbnum = (int)vecT.size()/2;
 
     std::vector<rocksdb::ColumnFamilyDescriptor> veccoldesc;
     veccoldesc.push_back(rocksdb::ColumnFamilyDescriptor(rocksdb::kDefaultColumnFamilyName, rocksdb::ColumnFamilyOptions()));  // ignore default col family
@@ -71,13 +72,14 @@ RocksDBStorageFactory::RocksDBStorageFactory(const char *dbfile, int dbnum, cons
     rocksdb::DB *db = nullptr;
 
     auto options = RocksDbOptions();
-    options.prefix_extractor.reset(rocksdb::NewFixedPrefixTransform(2));
+    options.prefix_extractor.reset(rocksdb::NewFixedPrefixTransform(HASHSLOT_PREFIX_BYTES));
 
     for (int idb = 0; idb < dbnum; ++idb)
     {
         rocksdb::ColumnFamilyOptions cf_options(options);
         cf_options.level_compaction_dynamic_level_bytes = true;
         veccoldesc.push_back(rocksdb::ColumnFamilyDescriptor(std::to_string(idb), cf_options));
+        veccoldesc.push_back(rocksdb::ColumnFamilyDescriptor(std::to_string(idb) + "_expires", cf_options));
     }
 
     if (rgchConfig != nullptr)
@@ -99,23 +101,29 @@ RocksDBStorageFactory::RocksDBStorageFactory(const char *dbfile, int dbnum, cons
     m_spdb = std::shared_ptr<rocksdb::DB>(db);
     for (auto handle : handles)
     {
-        std::string strVersion;
-        auto status = m_spdb->Get(rocksdb::ReadOptions(), handle, rocksdb::Slice(version_key, sizeof(version_key)), &strVersion);
-        if (!status.ok())
-        {
-            setVersion(handle);
-        }
-        else
-        {
-            SymVer ver = parseVersion(strVersion.c_str());
-            auto cmp = compareVersion(&ver);
-            if (cmp == NewerVersion)
-                throw "Cannot load FLASH database created by newer version of KeyDB";
-            if (cmp == OlderVersion)
+        if (handle->GetName().size() > 7 && !strncmp(handle->GetName().substr(handle->GetName().size() - 7).c_str(), "expires", 7)) {
+            m_vecspexpirecols.emplace_back(handle);
+        } else {
+            std::string strVersion;
+            auto status = m_spdb->Get(rocksdb::ReadOptions(), handle, rocksdb::Slice(version_key, sizeof(version_key)), &strVersion);
+            if (!status.ok())
+            {
                 setVersion(handle);
+            }
+            else
+            {
+                SymVer ver = parseVersion(strVersion.c_str());
+                auto cmp = compareVersion(&ver);
+                if (cmp == NewerVersion)
+                    throw "Cannot load FLASH database created by newer version of KeyDB";
+                if (cmp == IncompatibleVersion)
+                    throw "Cannot load FLASH database from before 6.3.4";
+                if (cmp == OlderVersion)
+                    setVersion(handle);
+            }
+            m_vecspcols.emplace_back(handle);
         }
-        m_vecspcols.emplace_back(handle);
-    }   
+    }
 }
 
 RocksDBStorageFactory::~RocksDBStorageFactory()
@@ -155,6 +163,7 @@ IStorage *RocksDBStorageFactory::create(int db, key_load_iterator iter, void *pr
 {
     ++db;   // skip default col family
     std::shared_ptr<rocksdb::ColumnFamilyHandle> spcolfamily(m_vecspcols[db].release());
+    std::shared_ptr<rocksdb::ColumnFamilyHandle> spexpirecolfamily(m_vecspexpirecols[db].release());
     size_t count = 0;
     bool fUnclean = false;
     
@@ -187,11 +196,11 @@ IStorage *RocksDBStorageFactory::create(int db, key_load_iterator iter, void *pr
                 printf("\tDatabase %d was not shutdown cleanly, recomputing metrics\n", db);
             fFirstRealKey = false;
             if (iter != nullptr)
-                iter(it->key().data()+2, it->key().size()-2, privdata);
+                iter(it->key().data()+HASHSLOT_PREFIX_BYTES, it->key().size()-HASHSLOT_PREFIX_BYTES, privdata);
             ++count;
         }
     }
-    return new RocksDBStorageProvider(this, m_spdb, spcolfamily, nullptr, count);
+    return new RocksDBStorageProvider(this, m_spdb, spcolfamily, spexpirecolfamily, nullptr, count);
 }
 
 const char *RocksDBStorageFactory::name() const
@@ -203,3 +212,21 @@ size_t RocksDBStorageFactory::totalDiskspaceUsed() const
 {
     return m_pfilemanager->GetTotalSize();
 }
+
+sdsstring RocksDBStorageFactory::getInfo() const
+{
+    struct statvfs fiData;
+    int status = statvfs(m_path.c_str(), &fiData);
+    if ( status == 0 ) {
+        return sdsstring(sdscatprintf(sdsempty(),
+            "storage_flash_used_bytes:%zu\r\n"
+            "storage_flash_total_bytes:%zu\r\n"
+            "storage_flash_rocksdb_bytes:%zu\r\n",
+            fiData.f_bfree * fiData.f_frsize,
+            fiData.f_blocks * fiData.f_frsize,
+            totalDiskspaceUsed()));
+    } else {
+        fprintf(stderr, "Failed to gather FLASH statistics with status: %d\r\n", status);
+        return sdsstring(sdsempty());
+    }
+}

src/storage/teststorageprovider.h

@@ -1,6 +1,7 @@
 #include "../IStorage.h"
 #include <string>
 #include <unordered_map>
+#include <vector>
 
 class TestStorageFactory : public IStorageFactory
 {
@@ -8,6 +9,7 @@ class TestStorageFactory : public IStorageFactory
     virtual class IStorage *createMetadataDb() override;
     virtual const char *name() const override;
     virtual size_t totalDiskspaceUsed() const override { return 0; }
+    virtual sdsstring getInfo() const override { return sdsstring(sdsempty()); }
     virtual bool FSlow() const override { return false; }
 };
 
@@ -27,6 +29,11 @@ public:
     virtual bool enumerate_hashslot(callback fn, unsigned int hashslot) const override;
     virtual size_t count() const override;
 
+    virtual std::vector<std::string> getExpirationCandidates(unsigned int) override { return std::vector<std::string>(); }
+    virtual std::vector<std::string> getEvictionCandidates(unsigned int) override { return std::vector<std::string>(); }
+    virtual void setExpire(const char *, size_t, long long) override {}
+    virtual void removeExpire(const char *, size_t, long long) override {}
+
     virtual void flush() override;
 
     /* This is permitted to be a shallow clone */

src/t_zset.cpp

@@ -2036,7 +2036,7 @@ struct zsetopsrc {
                 zset *zs;
                 zskiplistNode *node;
             } sl;
-        } zset;
+        } iterzset;
     } iter;
 };
 
@@ -2085,7 +2085,7 @@ void zuiInitIterator(zsetopsrc *op) {
         /* Sorted sets are traversed in reverse order to optimize for
          * the insertion of the elements in a new list as in
          * ZDIFF/ZINTER/ZUNION */
-        iterzset *it = (iterzset*)&op->iter.zset;
+        iterzset *it = (iterzset*)&op->iter.iterzset;
         if (op->encoding == OBJ_ENCODING_ZIPLIST) {
             it->zl.zl = (unsigned char*)op->subject->m_ptr;
             it->zl.eptr = ziplistIndex(it->zl.zl,-2);
@@ -2118,7 +2118,7 @@ void zuiClearIterator(zsetopsrc *op) {
             serverPanic("Unknown set encoding");
         }
     } else if (op->type == OBJ_ZSET) {
-        iterzset *it = &op->iter.zset;
+        iterzset *it = &op->iter.iterzset;
         if (op->encoding == OBJ_ENCODING_ZIPLIST) {
             UNUSED(it); /* skip */
         } else if (op->encoding == OBJ_ENCODING_SKIPLIST) {
@@ -2194,7 +2194,7 @@ int zuiNext(zsetopsrc *op, zsetopval *val) {
             serverPanic("Unknown set encoding");
         }
     } else if (op->type == OBJ_ZSET) {
-        iterzset *it = &op->iter.zset;
+        iterzset *it = &op->iter.iterzset;
         if (op->encoding == OBJ_ENCODING_ZIPLIST) {
             /* No need to check both, but better be explicit. */
             if (it->zl.eptr == NULL || it->zl.sptr == NULL)

src/tls.cpp

@@ -517,19 +517,38 @@ typedef struct tls_connection {
     aeEventLoop *el;
 } tls_connection;
 
-/* Check to see if a given client name matches against our allowlist.
+/* Check to see if a given client name is contained in the provided set (allowlist/blocklist)
  * Return true if it does */
-bool tlsCheckAgainstAllowlist(const char * client){
+bool tlsCheckAgainstAllowlist(const char * client, std::set<sdsstring> set){
     /* Because of wildcard matching, we need to iterate over the entire set.
      * If we were doing simply straight matching, we could just directly 
      * check to see if the client name is in the set in O(1) time */
-    for (auto &client_pattern: g_pserver->tls_allowlist){
+    for (auto &client_pattern: set){
         if (stringmatchlen(client_pattern.get(), client_pattern.size(), client, strlen(client), 1))
             return true;
     }
     return false;
 }
 
+/* Sets the sha256 certificate fingerprint on the connection
+ * Based on the example here https://fm4dd.com/openssl/certfprint.shtm */
+void tlsSetCertificateFingerprint(tls_connection* conn, X509 * cert) {
+    unsigned int fprint_size;
+    unsigned char fprint[EVP_MAX_MD_SIZE];
+    const EVP_MD *fprint_type = EVP_sha256();
+    X509_digest(cert, fprint_type, fprint, &fprint_size);
+
+    if (conn->c.fprint) zfree(conn->c.fprint);
+    conn->c.fprint = (char*)zcalloc(fprint_size*2+1);
+
+    /* Format fingerprint as hex string */
+    char tmp[3];
+    for (unsigned int i = 0; i < fprint_size; i++) {
+        snprintf(tmp, 2, "%02x", (unsigned int)fprint[i]);
+        strncat(conn->c.fprint, tmp, 2);
+    }
+}
+
 /* ASN1_STRING_get0_data was introduced in OPENSSL 1.1.1
  * use ASN1_STRING_data for older versions where it is not available */
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
@@ -549,19 +568,24 @@ public:
     }
 };
 
-bool tlsValidateCertificateName(tls_connection* conn){
-    if (g_pserver->tls_allowlist.empty())
-        return true;    // Empty list implies acceptance of all
+bool tlsCheckCertificateAgainstAllowlist(tls_connection* conn, std::set<sdsstring> allowlist, const char** commonName){
+    if (allowlist.empty()){
+        // An empty list implies acceptance of all
+        return true;
+    }
 
     X509 * cert = SSL_get_peer_certificate(conn->ssl);
     TCleanup certClen([cert]{X509_free(cert);});
-    
+
     /* Check the common name (CN) of the certificate first */
     X509_NAME_ENTRY * ne = X509_NAME_get_entry(X509_get_subject_name(cert), X509_NAME_get_index_by_NID(X509_get_subject_name(cert), NID_commonName, -1));
-    const char * commonName = reinterpret_cast<const char*>(ASN1_STRING_get0_data(X509_NAME_ENTRY_get_data(ne)));
-    
-    if (tlsCheckAgainstAllowlist(commonName))
+    *commonName = reinterpret_cast<const char*>(ASN1_STRING_get0_data(X509_NAME_ENTRY_get_data(ne)));
+
+    tlsSetCertificateFingerprint(conn, cert);
+
+    if (tlsCheckAgainstAllowlist(*commonName, allowlist)) {
         return true;
+    }
 
     /* If that fails, check through the subject alternative names (SANs) as well */
     GENERAL_NAMES* subjectAltNames = (GENERAL_NAMES*)X509_get_ext_d2i(cert, NID_subject_alt_name, NULL, NULL);
@@ -574,19 +598,19 @@ bool tlsValidateCertificateName(tls_connection* conn){
             switch (generalName->type)
             {
                 case GEN_EMAIL:
-                    if (tlsCheckAgainstAllowlist(reinterpret_cast<const char*>(ASN1_STRING_get0_data(generalName->d.rfc822Name)))){
+                    if (tlsCheckAgainstAllowlist(reinterpret_cast<const char*>(ASN1_STRING_get0_data(generalName->d.rfc822Name)), allowlist)){
                         sk_GENERAL_NAME_pop_free(subjectAltNames, GENERAL_NAME_free);
                         return true;
                     }
                     break;
                 case GEN_DNS:
-                    if (tlsCheckAgainstAllowlist(reinterpret_cast<const char*>(ASN1_STRING_get0_data(generalName->d.dNSName)))){
+                    if (tlsCheckAgainstAllowlist(reinterpret_cast<const char*>(ASN1_STRING_get0_data(generalName->d.dNSName)), allowlist)){
                         sk_GENERAL_NAME_pop_free(subjectAltNames, GENERAL_NAME_free);
                         return true;
                     }
                     break;
                 case GEN_URI:
-                    if (tlsCheckAgainstAllowlist(reinterpret_cast<const char*>(ASN1_STRING_get0_data(generalName->d.uniformResourceIdentifier)))){
+                    if (tlsCheckAgainstAllowlist(reinterpret_cast<const char*>(ASN1_STRING_get0_data(generalName->d.uniformResourceIdentifier)), allowlist)){
                         sk_GENERAL_NAME_pop_free(subjectAltNames, GENERAL_NAME_free);
                         return true;
                     }
@@ -597,7 +621,7 @@ bool tlsValidateCertificateName(tls_connection* conn){
                         if (ipLen == 4){ //IPv4 case
                             char addr[INET_ADDRSTRLEN];
                             inet_ntop(AF_INET, ASN1_STRING_get0_data(generalName->d.iPAddress), addr, INET_ADDRSTRLEN);
-                            if (tlsCheckAgainstAllowlist(addr)){
+                            if (tlsCheckAgainstAllowlist(addr, allowlist)){
                                 sk_GENERAL_NAME_pop_free(subjectAltNames, GENERAL_NAME_free);
                                 return true;
                             }
@@ -613,15 +637,36 @@ bool tlsValidateCertificateName(tls_connection* conn){
         sk_GENERAL_NAME_pop_free(subjectAltNames, GENERAL_NAME_free);
     }
 
-    /* If neither the CN nor the SANs match, update the SSL error and return false */
-    conn->c.last_errno = 0;
-    if (conn->ssl_error) zfree(conn->ssl_error);
-    size_t bufsize = 512;
-    conn->ssl_error = (char*)zmalloc(bufsize);
-    snprintf(conn->ssl_error, bufsize, "Client CN (%s) and SANs not found in allowlist.", commonName);
     return false;
 }
 
+bool tlsCertificateRequiresAuditLogging(tls_connection* conn){
+    const char* cn = "";
+    if (tlsCheckCertificateAgainstAllowlist(conn, g_pserver->tls_auditlog_blocklist, &cn)) {
+        // Certificate is in exclusion list, no need to audit log
+        serverLog(LL_NOTICE, "Audit Log: disabled for %s", conn->c.fprint);
+        return false;
+    } else {
+        serverLog(LL_NOTICE, "Audit Log: enabled for %s", conn->c.fprint);
+        return true;
+    }
+}
+
+bool tlsValidateCertificateName(tls_connection* conn){
+    const char* cn = "";
+    if (tlsCheckCertificateAgainstAllowlist(conn, g_pserver->tls_allowlist, &cn)) {
+        return true;
+    } else {
+        /* If neither the CN nor the SANs match, update the SSL error and return false */
+        conn->c.last_errno = 0;
+        if (conn->ssl_error) zfree(conn->ssl_error);
+        size_t bufsize = 512;
+        conn->ssl_error = (char*)zmalloc(bufsize);
+        snprintf(conn->ssl_error, bufsize, "Client CN (%s) and SANs not found in allowlist.", cn);
+        return false;
+    }
+}
+
 static connection *createTLSConnection(int client_side) {
     SSL_CTX *ctx = redis_tls_ctx;
     if (client_side && redis_tls_client_ctx)
@@ -844,6 +889,9 @@ void tlsHandleEvent(tls_connection *conn, int mask) {
                     conn->c.state = CONN_STATE_ERROR;
                 } else {
                     conn->c.state = CONN_STATE_CONNECTED;
+                    if (tlsCertificateRequiresAuditLogging(conn)){
+                        conn->c.flags |= CONN_FLAG_AUDIT_LOGGING_REQUIRED;
+                    }
                 }
             }
 

src/version.h

@@ -1,5 +1,5 @@
-#define KEYDB_REAL_VERSION "255.255.255"
-#define KEYDB_VERSION_NUM 0x00ffffff
+#define KEYDB_REAL_VERSION "6.3.4"
+#define KEYDB_VERSION_NUM 0x00060304
 extern const char *KEYDB_SET_VERSION;   // Unlike real version, this can be overriden by the config
 
 enum VersionCompareResult
@@ -7,6 +7,7 @@ enum VersionCompareResult
     EqualVersion,
     OlderVersion,
     NewerVersion,
+    IncompatibleVersion,
 };
 
 struct SymVer

tests/integration/replication.tcl

@@ -584,6 +584,7 @@ start_server {tags {"repl"}} {
     set master [srv 0 client]
     $master config set repl-diskless-sync yes
     $master config set repl-diskless-sync-delay 1
+    $master config set enable-keydb-fastsync no
     set master_host [srv 0 host]
     set master_port [srv 0 port]
     set master_pid [srv 0 pid]
@@ -727,6 +728,8 @@ start_server {tags {"repl"}} {
             }
         }
     }
+
+    $master config set enable-keydb-fastsync yes
 }
 
 if 0 {
@@ -867,8 +870,10 @@ test {replicaof right after disconnection} {
 test {Kill rdb child process if its dumping RDB is not useful} {
     start_server {tags {"repl"}} {
         set slave1 [srv 0 client]
+        $slave1 config set enable-keydb-fastsync no
         start_server {} {
             set slave2 [srv 0 client]
+            $slave2 config set enable-keydb-fastsync no
             start_server {} {
                 set master [srv 0 client]
                 set master_host [srv 0 host]

tests/test_helper.tcl

@@ -81,6 +81,7 @@ set ::all_tests {
     unit/pendingquerybuf
     unit/tls
     unit/tls-name-validation
+    unit/tls-auditlog
     unit/tracking
     unit/oom-score-adj
     unit/shutdown

tests/unit/cron.tcl

@@ -18,7 +18,7 @@ start_server {tags {"CRON"} overrides {hz 100} } {
 
     test {keydb.cron repeat works} {
         r flushall
-        r keydb.cron testjob repeat 0 600 {redis.call("incr","testkey")}
+        r keydb.cron testjob repeat 0 900 {redis.call("incr","testkey")}
         after 1000
         assert_equal 2 [r get testkey]
     }

tests/unit/flash.tcl

@@ -74,8 +74,11 @@ if {$::flash_enabled} {
             r set testkey foo ex 1
             r flushall cache
             assert_equal {1} [r dbsize]
-            after 1500
-            assert_equal {0} [r dbsize]
+            wait_for_condition 50 1000 {
+                [r dbsize] == 0
+            } else {
+                fail "key is not expired"
+            }
         }
 
         test { SUBKEY EXPIRE persists after cache flush } {
@@ -140,17 +143,17 @@ if {$::flash_enabled} {
                     r set $numkeys xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                     incr numkeys
                     if {[s used_memory]+1024 >= $limit} {
-                    break
+                        break
                     }
                 }
                 # Add additional keys to force eviction
                 # should still be under the limit for maxmemory, however all keys set should still exist between flash and memory
                 # check same number of keys exist in addition to values of first and last keys
                 set err 0
-            set extra_keys [expr floor([expr ($limit * 0.4) / 1024])]
+                set extra_keys [expr floor([expr ($limit * 0.4) / 1024])]
                 for {set j 0} {$j < $extra_keys} {incr j} {
                     catch {
-                    r set p2$j xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+                        r set p2$j xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                     } err
                     assert {$err == {OK}}
                 }
@@ -165,7 +168,49 @@ if {$::flash_enabled} {
                 assert {[r get last] == {val}}
                 r flushall
             }
-        }
 
+            test "FLASH - is flash eviction working? (policy $policy)" {
+                # Get the current memory limit and calculate a new limit.
+                # Set limit to 100M.
+                set used [s used_memory]
+                set limit [expr {$used+60*1024*1024}]
+                r config set maxmemory $limit
+                r config set maxmemory-policy $policy
+                # Now add keys equivalent to 1024b until the limit is almost reached.
+                set numkeys 0
+                r set first val
+                while 1 {
+                    r set $numkeys xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+                    incr numkeys
+                    if {[s used_memory]+1024 >= $limit} {
+                        break
+                    }
+                }
+                # Add additional keys to force eviction
+                # should still be under the limit for maxmemory, however all keys set should still exist between flash and memory
+                # check same number of keys exist in addition to values of first and last keys
+                set err 0
+                set extra_keys [expr floor([expr ($limit * 0.4) / 1024])]
+                for {set j 0} {$j < $extra_keys} {incr j} {
+                    catch {
+                        r set p2$j xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+                    } err
+                    assert {$err == {OK}}
+                }
+                if {[log_file_matches [srv 0 stdout] "*Failed to evict*"]} {
+                    fail "Server did not evict cleanly (detected full flush)"
+                }
+                r set last val
+                r debug flush-storage
+                r config set maxstorage 1
+                r config set maxmemory 1
+                set dbsize [r dbsize]
+                # after setting maxstorage and memory below used amount we should evict from storage provider
+                assert {$dbsize < $numkeys+$extra_keys+2}
+                r config set maxstorage 0
+                r config set maxmemory 0
+                r flushall
+            }
+        }
     }
 }

tests/unit/maxmemory.tcl

@@ -182,6 +182,8 @@ proc test_slave_buffers {test_name cmd_count payload_len limit_memory pipeline}
                 fail "Replication not started."
             }
 
+            after 100
+
             # measure used memory after the slave connected and set maxmemory
             set orig_used [s -1 used_memory]
             set orig_client_buf [s -1 mem_clients_normal]

tests/unit/moduleapi/load.tcl

@@ -1,7 +1,7 @@
 set testmodule [file normalize tests/modules/load.so]
 
 if {$::flash_enabled} {
-    start_server [list tags [list "modules"] overrides [list storage-provider {flash ./rocks.db.master} databases 256 loadmodule $testmodule]] {
+    start_server [list tags [list "modules"] overrides [list storage-provider {flash ./rocks.db.master.load.test} databases 256 loadmodule $testmodule]] {
         test "Module is notified of keys loaded from flash" {
             r flushall
             r set foo bar

tests/unit/tls-auditlog.tcl

@@ -0,0 +1,159 @@
+# only run this test if tls is enabled
+if {$::tls} {
+    package require tls
+
+    test {TLS Audit Log: Able to connect with no exclustion list} {
+            start_server {tags {"tls"}} {
+            catch {r PING} e
+            assert_match {PONG} $e
+        }
+    }
+
+    test {TLS Audit Log: Able to connect with exclusion list '*'} {
+        start_server {tags {"tls"} overrides {tls-auditlog-blocklist *}} {
+            catch {r PING} e
+            assert_match {PONG} $e
+        }
+    }
+
+    test {TLS Audit Log: Able to connect with matching CN} {
+        start_server {tags {"tls"} overrides {tls-auditlog-blocklist client.keydb.dev}} {
+            catch {r PING} e
+            assert_match {PONG} $e
+        }
+    }
+
+    test {TLS Audit Log: Able to connect with matching SAN} {
+        start_server {tags {"tls"} overrides {tls-auditlog-blocklist san1.keydb.dev}} {
+            catch {r PING} e
+            assert_match {PONG} $e
+        }
+    }
+
+    test {TLS Audit Log: Able to connect with matching CN with wildcard} {
+        start_server {tags {"tls"} overrides {tls-auditlog-blocklist client*.dev}} {
+            catch {r PING} e
+            assert_match {PONG} $e
+        }
+    }
+
+    test {TLS Audit Log: Able to connect with matching SAN with wildcard} {
+        start_server {tags {"tls"} overrides {tls-auditlog-blocklist san*.dev}} {
+            catch {r PING} e
+            assert_match {PONG} $e
+        }
+    }
+
+    test {TLS Audit Log: Able to connect while with CN having a comprehensive list} {
+        start_server {tags {"tls"} overrides {tls-auditlog-blocklist {dummy.keydb.dev client.keydb.dev other.keydb.dev}}} {
+            catch {r PING} e
+            assert_match {PONG} $e
+        }
+    }
+
+    test {TLS Audit Log: Able to connect while with SAN having a comprehensive list} {
+        start_server {tags {"tls"} overrides {tls-auditlog-blocklist {dummy.keydb.dev san2.keydb.dev other.keydb.dev}}} {
+            catch {r PING} e
+            assert_match {PONG} $e
+        }
+    }
+
+    test {TLS Audit Log: Able to connect while with CN having a comprehensive list with wildcards} {
+        start_server {tags {"tls"} overrides {tls-auditlog-blocklist {dummy.* client*.dev other.*}}} {
+            catch {r PING} e
+            assert_match {PONG} $e
+        }
+    }
+
+    test {TLS Audit Log: Able to connect while with SAN having a comprehensive list with wildcards} {
+        start_server {tags {"tls"} overrides {tls-auditlog-blocklist {dummy.* san*.dev other.*}}} {
+            catch {r PING} e
+            assert_match {PONG} $e
+        }
+    }
+
+    test {TLS Audit Log: Not matching CN or SAN accepted} {
+        start_server {tags {"tls"} overrides {tls-auditlog-blocklist {client.keydb.dev}}} {
+	    catch {r PING}
+            assert_match {PONG} $e
+        }
+    }
+
+    test {TLS Audit Log: Able to match against DNS SAN} {
+        start_server {tags {"tls"} overrides {tls-auditlog-blocklist {san1.keydb.dev}}} {
+            catch {r PING} e
+            assert_match {PONG} $e
+        }
+    }
+
+    test {TLS Audit Log: Able to match against email SAN} {
+        start_server {tags {"tls"} overrides {tls-auditlog-blocklist {someone@keydb.dev}}} {
+            catch {r PING} e
+            assert_match {PONG} $e
+        }
+    }
+
+    test {TLS Audit Log: Able to match against IPv4 SAN} {
+        start_server {tags {"tls"} overrides {tls-auditlog-blocklist {192.168.0.1}}} {
+            catch {r PING} e
+            assert_match {PONG} $e
+        }
+    }
+
+    test {TLS Audit Log: Able to match against IPv4 with a wildcard} {
+        start_server {tags {"tls"} overrides {tls-auditlog-blocklist {192.*}}} {
+            catch {r PING} e
+            assert_match {PONG} $e
+        }
+    }
+
+    test {TLS Audit Log: Able to match against URI SAN} {
+        start_server {tags {"tls"} overrides {tls-allowlist {https://keydb.dev}}} {
+            catch {r PING} e
+            assert_match {PONG} $e
+        }
+    }
+
+    test {TLS Audit Log: Able to connect with matching CN} {
+        start_server {tags {"tls"} overrides {tls-auditlog-blocklist test.dev}} {
+            r set testkey foo
+            wait_for_condition 50 1000 {
+                [log_file_matches [srv 0 stdout] "*Audit Log: *, cmd set, keys: testkey*"]
+            } else {
+                fail "Missing expected Audit Log entry"
+            }
+            catch {r PING} e
+            assert_match {PONG} $e
+        }
+    }
+
+    test {TLS Audit Log: Able to connect with matching TLS allowlist and Audit Log blocklist} {
+        start_server {tags {"tls"} overrides {tls-allowlist client.keydb.dev tls-auditlog-blocklist client.keydb.dev}} {
+            r set testkey foo
+            if {[log_file_matches [srv 0 stdout] "*Audit Log: *, cmd set, keys: testkey*"]} {
+                fail "Unexpected Audit Log entry"
+            }
+            catch {r PING} e
+            assert_match {PONG} $e
+        }
+    }
+
+    test {TLS Audit Log: Able to connect with different TLS allowlist and Audit Log blocklist} {
+        start_server {tags {"tls"} overrides {tls-allowlist client.keydb.dev tls-auditlog-blocklist test.dev}} {
+            r set testkey foo
+            wait_for_condition 50 1000 {
+                [log_file_matches [srv 0 stdout] "*Audit Log: *, cmd set, keys: testkey*"]
+            } else {
+                fail "Missing expected Audit Log entry"
+            }
+            catch {r PING} e
+            assert_match {PONG} $e
+        }
+    }
+
+} else {
+    start_server {} {
+        # just a dummy server so that the test doesn't panic if tls is disabled
+        # otherwise the test will try to bind to a server that just isn't there
+    }
+}