0.10.3 (#98)

* Add RclRef tests (#85) * Basho 3.0 upstream (#93)
riak-core-lite · Jul 13, 2021 · fadf987 · fadf987
1 parent 5c6b82d
commit fadf987
Show file tree

Hide file tree

Showing 18 changed files with 158 additions and 954 deletions.
diff --git a/.github/workflows/erlang.yml b/.github/workflows/erlang.yml
@@ -2,9 +2,7 @@ name: Erlang CI
 
 on:
   push:
-    branches: [ master ]
   pull_request:
-    branches: [ master ]
 
 jobs:
 
@@ -58,3 +56,28 @@ jobs:
     - run: make lint
     - run: make dialyzer
 
+  system-tests:
+    runs-on: ubuntu-latest
+    strategy: 
+      matrix:
+        erlang: [ 21,22,23,24 ]
+
+    container:
+      image: erlang:${{ matrix.erlang }}
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        repository: riak-core-lite/rclref
+        path: ./rclref
+
+    - uses: actions/checkout@v2
+      with:
+        path: ./riak_core/
+
+    - run: |
+        mkdir rclref/_checkouts;\
+        ln -s ../../riak_core/ rclref/_checkouts/riak_core;\
+        cd rclref;\
+        make ct
+
diff --git a/docs/rack-awareness.md b/docs/rack-awareness.md
diff --git a/docs/ring-location.png b/docs/ring-location.png
diff --git a/include/riak_core_handoff.hrl b/include/riak_core_handoff.hrl
@@ -18,7 +18,7 @@
 
 -record(ho_stats,
         {interval_end :: erlang:timestamp(),
-         last_update :: erlang:timestamp() | undefined,
+         last_update = os:timestamp() :: erlang:timestamp(),
          objs = 0 :: non_neg_integer(),
          bytes = 0 :: non_neg_integer()}).
 
@@ -50,10 +50,10 @@
          type :: ho_type() | undefined,
          req_origin :: node(),
          filter_mod_fun :: {module(), atom()} | undefined,
-         size ::
+         size = {0, objects}::
              {function(), dynamic} |
-             {non_neg_integer(), bytes | objects} |
-             undefined}).
+             {non_neg_integer(), bytes | objects}
+        }).
 
 -type handoff_status() :: #handoff_status{}.
 

diff --git a/src/riak_core.app.src b/src/riak_core.app.src
@@ -1,7 +1,7 @@
 {application,
  riak_core,
  [{description, "Riak Core Lite"},
-  {vsn, "0.10.2"},
+  {vsn, "0.10.3"},
   {applications,
    [kernel, stdlib, crypto, os_mon, poolboy]},
   {mod, {riak_core_app, []}},

diff --git a/src/riak_core_claim.erl b/src/riak_core_claim.erl
@@ -208,7 +208,8 @@ wants_claim_v2(Ring, Node) ->
     Count = proplists:get_value(Node, Counts, 0),
     case Count < Avg of
         false -> no;
-        true -> {yes, Avg - Count}
+        true ->
+            {yes, Avg - Count}
     end.
 
 %% @doc Provide default choose parameters if none given
@@ -293,8 +294,7 @@ choose_claim_v2(Ring, Node, Params0) ->
             %% number of indices desired is less than the computed set.
             Padding = lists:duplicate(TargetN, undefined),
             Expanded = lists:sublist(Active ++ Padding, TargetN),
-            PreferredClaim = riak_core_claim:diagonal_stripe(Ring,
-                                                             Expanded),
+            PreferredClaim = riak_core_claim:diagonal_stripe(Ring, Expanded),
             PreferredNth = [begin
                                 {Nth, Idx} = lists:keyfind(Idx, 2, AllIndices),
                                 Nth
@@ -316,13 +316,9 @@ choose_claim_v2(Ring, Node, Params0) ->
                                     TargetN,
                                     RingSize),
     %% Claim indices from the remaining candidate set
-    Claim = select_indices(Owners,
-                           Deltas,
-                           Indices2,
-                           TargetN,
-                           RingSize),
+    Claim = select_indices(Owners, Deltas, Indices2, TargetN, RingSize),
     Claim2 = lists:sublist(Claim, Want),
-    NewRing = lists:foldl(fun (Idx, Ring0) ->
+    NewRing = lists:foldl(fun(Idx, Ring0) ->
                                   riak_core_ring:transfer_node(Idx, Node, Ring0)
                           end,
                           Ring,
@@ -572,8 +568,7 @@ claim_diagonal(Wants, Owners, Params) ->
                        node(), integer()) -> riak_core_ring:riak_core_ring().
 
 sequential_claim(Ring, Node, TargetN) ->
-    Nodes = lists:usort([Node
-                         | riak_core_ring:claiming_members(Ring)]),
+    Nodes = lists:usort([Node|riak_core_ring:claiming_members(Ring)]),
     NodeCount = length(Nodes),
     RingSize = riak_core_ring:num_partitions(Ring),
     Overhang = RingSize rem NodeCount,
@@ -696,8 +691,7 @@ backfill_ring(RingSize, Nodes, Remaining, Acc) ->
                         Node :: term()) -> ring().
 
 claim_rebalance_n(Ring, Node) ->
-    Nodes = lists:usort([Node
-                         | riak_core_ring:claiming_members(Ring)]),
+    Nodes = lists:usort([Node|riak_core_ring:claiming_members(Ring)]),
     Zipped = diagonal_stripe(Ring, Nodes),
     lists:foldl(fun ({P, N}, Acc) ->
                         riak_core_ring:transfer_node(P, N, Acc)