Merge branch '2.0' into develop

Author: jaredmorrow

riak_test/intercepts/yz_solr_intercepts.erl

@@ -0,0 +1,6 @@
+-module(yz_solr_intercepts).
+-compile(export_all).
+
+slow_cores() ->
+    timer:sleep(6000),
+    {ok, []}.

riak_test/yz_handoff_blocking.erl

@@ -0,0 +1,41 @@
+%% @doc Verify yokozuna cannot block kv handoff forever
+-module(yz_handoff_blocking).
+-compile(export_all).
+-include_lib("eunit/include/eunit.hrl").
+-define(FMT(S, Args), lists:flatten(io_lib:format(S, Args))).
+-define(INDEX, <<"handoff_blocking">>).
+-define(CFG,
+        [{riak_core,
+          [
+           {ring_creation_size, 16}
+          ]},
+	 {yokozuna,
+	  [
+	   {enabled, true}
+	  ]}
+        ]).
+
+confirm() ->
+    [Node, Node2] = Cluster = rt:deploy_nodes(2, ?CFG),
+
+    %% create an index on one node and populate it with some data
+    yz_rt:create_index(Node, ?INDEX),
+    ok = yz_rt:wait_for_index([Node], ?INDEX),
+    ok = yz_rt:set_bucket_type_index(Node, ?INDEX),
+    ConnInfo = yz_rt:connection_info([Node]),
+    {Host, Port} = yz_rt:riak_http(proplists:get_value(Node, ConnInfo)),
+    URL = ?FMT("http://~s:~s/types/~s/buckets/~s/keys/~s",
+               [Host, integer_to_list(Port), ?INDEX, <<"bucket">>, <<"key">>]),
+    Headers = [{"content-type", "text/plain"}],
+    Body = <<"yokozuna">>,
+    {ok, "204", _, _} = ibrowse:send_req(URL, Headers, put, Body, []),
+
+    %% load and install the intercept
+    rt_intercept:load_code(Node2, [filename:join([rt_config:get(yz_dir), "riak_test", "intercepts", "*.erl"])]),
+    rt_intercept:add(Node2, {yz_solr, [{{cores,0}, slow_cores}]}),
+
+    %% join a node
+    rt:join_cluster(Cluster),
+    ok = rt:wait_until_no_pending_changes(Cluster),
+
+    pass.

src/yz_kv.erl

@@ -149,13 +149,22 @@ get_index({Bucket, _}) ->
 should_handoff({_Reason, {_Partition, TargetNode}}) ->
     case ?YZ_ENABLED andalso is_service_up(?YZ_SVC_NAME, TargetNode) of
         true ->
-            case is_metadata_consistent(TargetNode) andalso
-                 has_indexes(TargetNode) of
-                true ->
+            Consistent = is_metadata_consistent(TargetNode),
+            HasIndexes = has_indexes(TargetNode),
+            case {Consistent, HasIndexes} of
+                {true, true} ->
                     true;
-                false ->
+                {false, false} ->
                     ?INFO("waiting for bucket types prefix and indexes to agree between ~p and ~p",
                           [node(), TargetNode]),
+                    false;
+                {false, _} ->
+                    ?INFO("waiting for bucket types prefix to agree between ~p and ~p",
+                          [node(), TargetNode]),
+                    false;
+                {_, false} ->
+                    ?INFO("waiting for indexes to agree between ~p and ~p",
+                          [node(), TargetNode]),
                     false
             end;
         false ->

tools/build-solr.sh

@@ -8,7 +8,7 @@
 #>
 #> Example:
 #>
-#>   ./build-solr.sh --patch-dir ~/yokozuna/solr-patches /tmp/build-solr solr-4.6.1-yz http://www.motorlogy.com/apache/lucene/solr/4.6.1/solr-4.6.1-src.tgz | tee build-solr.out
+#>   ./build-solr.sh --patch-dir ~/yokozuna/solr-patches /tmp/build-solr solr-4.7.0-yz http://archive.apache.org/dist/lucene/solr/4.7.0/solr-4.7.0-src.tgz | tee build-solr.out
 
 set -e
 
@@ -145,4 +145,3 @@ tar zcvf $NAME.tgz \
     --exclude=example/etc/solrtest.keystore \
     $NAME
 mv $NAME solr
-