Nhse d34 nhskv.i33 token

.github/workflows/erlang.yml

@@ -2,9 +2,15 @@ name: Erlang CI
 
 on:
   push:
-    branches: [ nhse-develop ]
+    branches:
+      - nhse-develop
+      - nhse-develop-3.2
+      - nhse-develop-3.4
   pull_request:
-    branches: [ nhse-develop ]
+    branches:
+      - nhse-develop
+      - nhse-develop-3.2
+      - nhse-develop-3.4
 
 
 jobs:
@@ -17,25 +23,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        otp: [22, 24, 25]
+        otp: [24, 26]
         os: [ubuntu-latest]
-        # OTP lower than 23 does not run on ubuntu-latest (22.04), see
-        # https://github.com/erlef/setup-beam#compatibility-between-operating-system-and-erlangotp
-        exclude:
-          - otp: 22
-            os: ubuntu-latest
-        include:
-          - otp: 22
-            os: ubuntu-20.04
 
     steps:
       - uses: lukka/get-cmake@latest
-      - uses: actions/checkout@v2
-      - name: Install dependencies (Ubuntu)
-        if: ${{ startsWith(matrix.os, 'ubuntu') }}
-        run: |
-          sudo apt-get -qq update
-          sudo apt-get -qq install libsnappy-dev libc6-dev
+      - uses: actions/checkout@v4
       - name: Install Erlang/OTP
         uses: erlef/setup-beam@v1
         with:

eqc/ec_eqc.erl

@@ -671,13 +671,15 @@ get_fsm_proc(ReqId, #params{n = N, r = R}) ->
     DeletedVclock = true,
     ExpectedVclock = false,
     NodeConfirms = 0,
+    ReturnBody = true,
     GetCore = riak_kv_get_core:init(N, R,
                                     0, %% SLF hack
                                     FailThreshold,
                                     NotFoundOk, AllowMult, DeletedVclock,
                                     [{Idx, primary} || Idx <- lists:seq(1, N)], %% SLF hack
                                     ExpectedVclock,
-                                    NodeConfirms
+                                    NodeConfirms,
+                                    ReturnBody
                                    ),
     #proc{name = {get_fsm, ReqId}, handler = get_fsm,
           procst = #getfsmst{getcore = GetCore}}.

priv/riak_kv.schema

@@ -540,6 +540,29 @@
     hidden
 ]}.
 
+%% @doc Enable stronger conditional checks on PUTs
+%% Will require a conditional PUT to wait for a token.  On timeout will PUT
+%% without token
+{mapping, "stronger_conditional_put", "riak_kv.stronger_conditional_put", [
+  {default, off},
+  {datatype, flag}
+]}.
+
+%% @doc Strong conditional NVal (token request)
+%% NVal when requetsing tokens, should not be set to a lower value than the
+%% target_n_val.  Tested for values of 1 (single node clusters only), 3, 5
+%% and 7
+{mapping, "stronger_conditional_nval", "riak_kv.stronger_conditional_nval", [
+  {default, 5},
+  {datatype, integer},
+  {validators, ["tested_nval"]}
+]}.
+
+{validator,
+ "tested_nval",
+ "must be one of 1, 3, 5, 7",
+ fun(Value) -> lists:member(Value, [1, 3, 5, 7]) end}.
+
 %% @doc Controls which binary representation of a riak value is stored
 %% on disk.
 %% * 0: Original erlang:term_to_binary format. Higher space overhead.