Merge develop to s3-develop to pick up riak client changes

basho_builds.yml

@@ -0,0 +1,19 @@
+docker_rt_riak_test_config:
+  - version: current
+    product_version: current
+    product: "riak{% if ee == 'true' %}_ee{% endif %}"
+  - version: previous
+    product_version: 2.2.0
+    product: "riak{% if ee == 'true' %}_ee{% endif %}"
+  - version: legacy
+    product_version: 2.0.9
+    product: "riak{% if ee == 'true' %}_ee{% endif %}"
+  - version: 2.0.2
+    product_version: 2.0.2
+    product: "riak{% if ee == 'true' %}_ee{% endif %}"
+  - version: 2.0.4
+    product_version: 2.0.4
+    product: "riak{% if ee == 'true' %}_ee{% endif %}"
+  - version: 2.0.5
+    product_version: 2.0.5
+    product: "riak{% if ee == 'true' %}_ee{% endif %}"

bin/rtdev-install.sh

@@ -46,15 +46,17 @@ cd $RT_DEST_DIR
 
 echo " - Reinitializing git state"
 
-## Some versions of git and/or OS require these fields
-HAS_LOCAL=$(git config --local 2>&1 | grep unknown)
-if [ -z "$HAS_LOCAL" ]; then
-    git config --local user.name "Riak Test"
-    git config --local user.email "[email protected]"
-    git config --local core.autocrlf input
-    git config --local core.safecrlf false
-    git config --local core.filemode true
-fi
+# Set the path to the root of the working tree. This prevents git to
+# ascend the directory tree (and possibly mess with other
+# repositories). That is, changes we are going to make with `git
+# config` will only affect the rt repo we have just created.
+GIT_WORK_TREE="$RT_DEST_DIR"
+git config user.name "Riak Test"
+git config user.email "[email protected]"
+git config core.autocrlf input
+git config core.safecrlf false
+git config core.filemode true
+
 
 git add --all --force .
 git commit -a -m "riak_test init" --amend > /dev/null

bin/rtdev-setup-releases.sh

@@ -35,24 +35,24 @@ else
     echo "No devdirs found. Not copying any releases."
 fi
 
-cd $RT_DEST_DIR
-git init 
-
-## Some versions of git and/or OS require these fields
-HAS_LOCAL=$(git config --local 2>&1 | grep unknown)
-if [ -z "$HAS_LOCAL" ]; then
-    git config --local user.name "Riak Test"
-    git config --local user.email "[email protected]"
-    git config --local core.autocrlf input
-    git config --local core.safecrlf false
-    git config --local core.filemode true
-fi
+cd "$RT_DEST_DIR"
+git init
+
+# Set the path to the root of the working tree. This prevents git to
+# ascend the directory tree (and possibly mess with other
+# repositories). That is, changes we are going to make with `git
+# config` will only affect the rt repo we have just created.
+GIT_WORK_TREE="$RT_DEST_DIR"
+git config user.name "Riak Test"
+git config user.email "[email protected]"
+git config core.autocrlf input
+git config core.safecrlf false
+git config core.filemode true
 
 ## this prevents priv/*.so files from being deleted by git clean -fd
 ## (the latter is executed in rtdev-current.sh):
 echo "priv/" >.gitignore
 
 git add --all --force .
 git commit -a -m "riak_test init" > /dev/null
-
 echo " - Successfully completed initial git commit of $RT_DEST_DIR"

intercepts/riak_kv_bitcask_backend_intercepts.erl

@@ -48,3 +48,11 @@ corrupting_get(Bucket, Key, ModState) ->
 
 corrupt_binary(O) ->
     crypto:rand_bytes(byte_size(O)).
+
+always_corrupt_get(Bucket, Key, ModState) ->
+    case ?M:get_orig(Bucket, Key, ModState) of
+        {ok, BinVal0, UpdModState} ->
+            BinVal = corrupt_binary(BinVal0),
+            {ok, BinVal, UpdModState};
+        Else -> Else
+    end.

intercepts/riak_kv_qry_buffers_intercepts.erl

@@ -1,6 +1,6 @@
 %% -------------------------------------------------------------------
 %%
-%% Copyright (c) 2016 Basho Technologies, Inc.
+%% Copyright (c) 2016, 2017 Basho Technologies, Inc.
 %%
 %% This file is provided to you under the Apache License,
 %% Version 2.0 (the "License"); you may not use this file

rebar.config.lock

@@ -25,13 +25,13 @@
                            "51b79c5b05eb04640e13131f06ef96561b96ba8e"}},
        {hamcrest,".*",
                  {git,"https://github.com/basho/hamcrest-erlang.git",
-                      "98bc7aa19ea081478c816824aa05fc5a48acae66"}},
+                      "ad3dbab419762fc2d5821abb88b989da006b85c6"}},
        {riak_pb,".*",
                 {git,"https://github.com/basho/riak_pb",
-                     "6c67dc58251e1a1c29b2e0c444b1e9c9aa2d4a24"}},
+                     "08771aba2ce4935b715d32d1b92555efdc3da994"}},
        {riakc,".*",
               {git,"https://github.com/basho/riak-erlang-client",
-                   "87958bdf1926d752fb1319b6788330176f6dd591"}},
+                   "9167ad627348d4995ef60c93c63ce39a16eb9735"}},
        {ibrowse,".*",
                 {git,"https://github.com/basho/ibrowse.git",
                      "b28542d1e326ba44bcfaf7fd6d3c7f8761d20f08"}},

src/rt.erl

@@ -561,6 +561,20 @@ heal({_NewCookie, OldCookie, P1, P2}) ->
     {_GN, []} = rpc:sbcast(Cluster, riak_core_node_watcher, broadcast),
     ok.
 
+%% @doc heal the partition created by call to partition/2, but if some
+%% node in P1 is down, just skip it, rather than failing. Returns {ok,
+%% list(node())} where the list is those nodes down and therefore not
+%% healed/reconnected.
+heal_upnodes({_NewCookie, OldCookie, P1, P2}) ->
+    %% set OldCookie on UP P1 Nodes
+    Res = [{N, rpc:call(N, erlang, set_cookie, [N, OldCookie])} || N <- P1],
+    UpForReconnect = [N || {N, true} <- Res],
+    DownForReconnect = [N || {N, RPC} <- Res, RPC /= true],
+    Cluster = UpForReconnect ++ P2,
+    wait_until_connected(Cluster),
+    {_GN, []} = rpc:sbcast(Cluster, riak_core_node_watcher, broadcast),
+    {ok, DownForReconnect}.
+
 %% @doc Spawn `Cmd' on the machine running the test harness
 spawn_cmd(Cmd) ->
     ?HARNESS:spawn_cmd(Cmd).
@@ -778,6 +792,17 @@ wait_until_transfers_complete([Node0|_]) ->
     ?assertEqual(ok, wait_until(Node0, F)),
     ok.
 
+%% @doc Waits until hinted handoffs from `Node0' are complete
+wait_until_node_handoffs_complete(Node0) ->
+    lager:info("Wait until Node's transfers complete ~p", [Node0]),
+    F = fun(Node) ->
+                Handoffs = rpc:call(Node, riak_core_handoff_manager, status, [{direction, outbound}]),
+                lager:info("Handoffs: ~p", [Handoffs]),
+                Handoffs =:= []
+        end,
+    ?assertEqual(ok, wait_until(Node0, F)),
+    ok.
+
 wait_for_service(Node, Services) when is_list(Services) ->
     F = fun(N) ->
                 case rpc:call(N, riak_core_node_watcher, services, [N]) of