diff --git a/.github/workflows/kvrocks.yaml b/.github/workflows/kvrocks.yaml index f5f53c0e483..d855109a78a 100644 --- a/.github/workflows/kvrocks.yaml +++ b/.github/workflows/kvrocks.yaml @@ -428,6 +428,9 @@ jobs: - name: Rocky Linux 9 image: rockylinux:9 compiler: gcc + - name: Debian 12 + image: debian:12 + compiler: gcc runs-on: ubuntu-22.04 container: @@ -474,6 +477,13 @@ jobs: update-alternatives --install /usr/bin/c++ c++ /opt/rh/gcc-toolset-12/root/usr/bin/g++ 100 echo "NPROC=$(nproc)" >> $GITHUB_ENV + - name: Setup Debian 12 + if: ${{ startsWith(matrix.image, 'debian') }} + run: | + apt update + apt install -y bash build-essential cmake curl git libssl-dev libtool python3 python3-pip wget + echo "NPROC=$(nproc)" >> $GITHUB_ENV + - name: Cache redis id: cache-redis uses: actions/cache@v3 @@ -492,6 +502,7 @@ jobs: - name: Install redis if: ${{ steps.cache-redis.outputs.cache-hit != 'true' || steps.cache-redis-server.outputs.cache-hit != 'true' }} + shell: bash run: | curl -O https://download.redis.io/releases/redis-6.2.14.tar.gz tar -xzvf redis-6.2.14.tar.gz @@ -520,11 +531,16 @@ jobs: GOCASE_RUN_ARGS="" ./x.py test go build $GOCASE_RUN_ARGS - - name: Install redis-py - if: ${{ !startsWith(matrix.image, 'archlinux') }} # already installed + - name: Install redis-py for openSUSE and Rocky + if: ${{ !startsWith(matrix.image, 'archlinux') && !startsWith(matrix.image, 'debian') }} run: pip3 install redis==4.3.6 + - name: Install redis-py for Debian + if: ${{ startsWith(matrix.image, 'debian') }} + run: apt install -y python3-redis + - name: Run kvrocks2redis Test + shell: bash run: | $HOME/local/bin/redis-server --daemonize yes mkdir -p kvrocks2redis-ci-data diff --git a/kvrocks.conf b/kvrocks.conf index fda3da0c8e5..b5ad860a4a1 100644 --- a/kvrocks.conf +++ b/kvrocks.conf @@ -335,6 +335,20 @@ json-max-nesting-depth 1024 # Default: json json-storage-format json +# Whether to enable transactional mode engine::Context. +# +# If enabled, is_txn_mode in engine::Context will be set properly, +# which is expected to improve the consistency of commands. +# If disabled, is_txn_mode in engine::Context will be set to false, +# making engine::Context equivalent to engine::Storage. +# +# NOTE: This is an experimental feature. If you find errors, performance degradation, +# excessive memory usage, excessive disk I/O, etc. after enabling it, please try disabling it. +# At the same time, we welcome feedback on related issues to help iterative improvements. +# +# Default: no +txn-context-enabled no + ################################## TLS ################################### # By default, TLS/SSL is disabled, i.e. `tls-port` is set to 0. diff --git a/src/config/config.cc b/src/config/config.cc index 1fbfe928f97..de914014239 100644 --- a/src/config/config.cc +++ b/src/config/config.cc @@ -193,6 +193,7 @@ Config::Config() { {"json-max-nesting-depth", false, new IntField(&json_max_nesting_depth, 1024, 0, INT_MAX)}, {"json-storage-format", false, new EnumField(&json_storage_format, json_storage_formats, JsonStorageFormat::JSON)}, + {"txn-context-enabled", true, new YesNoField(&txn_context_enabled, false)}, /* rocksdb options */ {"rocksdb.compression", false, diff --git a/src/config/config.h b/src/config/config.h index 798bbc97480..c1cf5da9501 100644 --- a/src/config/config.h +++ b/src/config/config.h @@ -168,6 +168,9 @@ struct Config { int json_max_nesting_depth = 1024; JsonStorageFormat json_storage_format = JsonStorageFormat::JSON; + // Enable transactional mode in engine::Context + bool txn_context_enabled = false; + struct RocksDB { int block_size; bool cache_index_and_filter_blocks; diff --git a/src/storage/storage.h b/src/storage/storage.h index 9c63582d6ab..dfc0fec968f 100644 --- a/src/storage/storage.h +++ b/src/storage/storage.h @@ -388,7 +388,8 @@ struct Context { std::unique_ptr batch = nullptr; /// is_txn_mode is used to determine whether the current Context is in transactional mode, - /// if it is not transactional mode, then Context is equivalent to a Storage + /// if it is not transactional mode, then Context is equivalent to a Storage. + /// If the configuration of txn-context-enabled is no, it is false. bool is_txn_mode = true; /// NoTransactionContext returns a Context with a is_txn_mode of false @@ -409,6 +410,10 @@ struct Context { /// TODO: Change it to defer getting the context, and the snapshot is pinned after the first read operation explicit Context(engine::Storage *storage) : storage(storage) { auto guard = storage->ReadLockGuard(); + if (!storage->GetConfig()->txn_context_enabled) { + is_txn_mode = false; + return; + } snapshot = storage->GetDB()->GetSnapshot(); // NOLINT } ~Context() {