diff --git a/.thumbs.yml b/.thumbs.yml new file mode 100644 index 00000000..f28fff75 --- /dev/null +++ b/.thumbs.yml @@ -0,0 +1,11 @@ +minimum_reviewers: 2 +merge: true +build_steps: + - make clean + - make deps + - make compile + - make test + - make xref + - make dialyzer +org_mode: true +timeout: 1800 diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..e454a525 --- /dev/null +++ b/LICENSE @@ -0,0 +1,178 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + diff --git a/dialyzer.ignore-warnings b/dialyzer.ignore-warnings index 1c1ac711..5971611b 100644 --- a/dialyzer.ignore-warnings +++ b/dialyzer.ignore-warnings @@ -3,17 +3,10 @@ riak_repl_keylist_client.erl:218: The call application:unset_env('riak_repl',{'p riak_repl_keylist_client.erl:267: The call application:unset_env('riak_repl',{'progress',_}) breaks the contract (Application,Par) -> 'ok' when is_subtype(Application,atom()), is_subtype(Par,atom()) riak_repl_keylist_client.erl:120: The call application:unset_env('riak_repl',{'progress',_}) breaks the contract (Application,Par) -> 'ok' when is_subtype(Application,atom()), is_subtype(Par,atom()) riak_repl_keylist_client.erl:132: The call application:set_env('riak_repl',{'progress',_},nonempty_maybe_improper_list()) breaks the contract (Application,Par,Val) -> 'ok' when is_subtype(Application,atom()), is_subtype(Par,atom()), is_subtype(Val,term()) -riak_core_connection.erl:108: Function exchange_handshakes_with/4 has no local return riak_core_connection.erl:172: The call ranch_tcp:send(Socket::port(),Hello::binary()) breaks the contract (inet:socket(),iolist()) -> 'ok' | {'error',atom()} -riak_repl_keylist_client.erl:106: The call application:unset_env('riak_repl',{'progress',_}) breaks the contract (Application,Par) -> 'ok' when is_subtype(Application,atom()), is_subtype(Par,atom()) -riak_repl_keylist_client.erl:216: The call application:unset_env('riak_repl',{'progress',_}) breaks the contract (Application,Par) -> 'ok' when is_subtype(Application,atom()), is_subtype(Par,atom()) -riak_repl_keylist_client.erl:265: The call application:unset_env('riak_repl',{'progress',_}) breaks the contract (Application,Par) -> 'ok' when is_subtype(Application,atom()), is_subtype(Par,atom()) -riak_repl_keylist_client.erl:118: The call application:unset_env('riak_repl',{'progress',_}) breaks the contract (Application,Par) -> 'ok' when is_subtype(Application,atom()), is_subtype(Par,atom()) -riak_repl_keylist_client.erl:130: The call application:set_env('riak_repl',{'progress',_},nonempty_maybe_improper_list()) breaks the contract (Application,Par,Val) -> 'ok' when is_subtype(Application,atom()), is_subtype(Par,atom()), is_subtype(Val,term()) -riak_core_connection_mgr.erl:546: The pattern 'ok' can never match the type {'error',atom()} -cluster_info:format/3 -cluster_info:register_app/1 -Unknown functions gen_leader.erl:936: The call sys:handle_debug(Debug::any(),{'gen_leader', 'print_event'},any(),{'in',_}) breaks the contract (Debug,FormFunc,Extra,Event) -> [dbg_opt()] when is_subtype(Debug,[dbg_opt()]), is_subtype(FormFunc,dbg_fun()), is_subtype(Extra,term()), is_subtype(Event,system_event()) gen_leader.erl:952: Function system_terminate/4 has no local return gen_leader.erl:1115: The call sys:handle_debug(Debug::any(),{'gen_leader', 'print_event'},any(),Event::{'$leader_cast',_} | {'noreply',_} | {'ok',_} | {'out',_,_,_}) breaks the contract (Debug,FormFunc,Extra,Event) -> [dbg_opt()] when is_subtype(Debug,[dbg_opt()]), is_subtype(FormFunc,dbg_fun()), is_subtype(Extra,term()), is_subtype(Event,system_event()) +Unknown functions: + cluster_info:format/3 + cluster_info:register_app/1 diff --git a/rebar.config b/rebar.config index fbb9ce31..f178c811 100644 --- a/rebar.config +++ b/rebar.config @@ -9,11 +9,11 @@ {xref_queries, [{"(XC - UC) || (XU - X - B - cluster_info : Mod)", []}]}. {deps, [ - {lager, ".*", {git, "git://github.com/basho/lager.git", {tag, "3.2.4"}}}, - {ranch, "0.4.0-p1", {git, "git://github.com/basho/ranch.git", {tag, "0.4.0-p1"}}}, - {ebloom, ".*", {git, "git://github.com/basho/ebloom.git", {tag, "2.0.0"}}}, - {riak_kv, ".*", {git, "git://github.com/basho/riak_kv.git", {tag, "2.1.7"}}}, - {riak_repl_pb_api, ".*", {git, "git@github.com:basho/riak_repl_pb_api.git", {tag, "2.4.0"}}} + {lager, ".*", {git, "https://github.com/basho/lager.git", {tag, "3.2.4"}}}, + {ranch, "0.4.0-p1", {git, "https://github.com/basho/ranch.git", {tag, "0.4.0-p1"}}}, + {ebloom, ".*", {git, "https://github.com/basho/ebloom.git", {tag, "2.0.0"}}}, + {riak_kv, ".*", {git, "https://github.com/basho/riak_kv.git", {tag, "2.1.8"}}}, + {riak_repl_pb_api, ".*", {git, "git@github.com:basho/riak_repl_pb_api.git", {tag, "2.6.0"}}} ]}. {edoc_opts, [{preprocess, true}]}. diff --git a/src/riak_core_connection_mgr.erl b/src/riak_core_connection_mgr.erl index 4692f367..3e534edb 100644 --- a/src/riak_core_connection_mgr.erl +++ b/src/riak_core_connection_mgr.erl @@ -396,7 +396,7 @@ handle_info({'EXIT', From, Reason}, State = #state{pending = Pending}) -> Reason -> % something bad happened to the connection, reuse the request lager:debug("handle_info: EP failed on ~p for ~p. removed Ref ~p", [Cur, Reason, Ref]), - State2 = fail_endpoint(Cur, Reason, ProtocolId, State), + State2 = fail_endpoint(Cur, Reason, ProtocolId, State#state{pending = Pending2}), %% the connection helper will not retry. It's up the caller. State3 = fail_request(Reason, Req, State2), {noreply, State3} diff --git a/src/riak_repl_aae_source.erl b/src/riak_repl_aae_source.erl index 338e9fd6..2b2105aa 100644 --- a/src/riak_repl_aae_source.erl +++ b/src/riak_repl_aae_source.erl @@ -657,7 +657,7 @@ send_missing(Bucket, Key, State=#state{client=Client, wire_ver=Ver, proto=Proto} end; {error, notfound} -> %% can't find the key! - lager:warning("not_found returned for fullsync client get on Bucket: ~p Key:~p", [Bucket,Key]), + %% Likely because the object expired and riak_kv_vnode deleted it. 0; {error, timeout} -> lager:warning("timeout during fullsync client get on Bucket: ~p Key:~p", [Bucket,Key]), diff --git a/src/riak_repl_fullsync_worker.erl b/src/riak_repl_fullsync_worker.erl index 0d4684b4..e9f7dccf 100644 --- a/src/riak_repl_fullsync_worker.erl +++ b/src/riak_repl_fullsync_worker.erl @@ -86,7 +86,7 @@ handle_call({get, B, K, Transport, Socket, Pool, Partition, Ver}, From, State) - ReqID = make_req_id(), - Req = ?KV_GET_REQ{bkey={B, K}, req_id=ReqID}, + Req = riak_kv_requests:new_get_request({B, K}, ReqID), %% Assuming this function is called from a FSM process %% so self() == FSM pid riak_core_vnode_master:command(Preflist, diff --git a/src/riak_repl_pb_get.erl b/src/riak_repl_pb_get.erl index ff89b0bd..6d1c4589 100644 --- a/src/riak_repl_pb_get.erl +++ b/src/riak_repl_pb_get.erl @@ -56,8 +56,8 @@ decode(?PB_MSG_GET_CLUSTER_ID, <<>>) -> encode(#rpbgetresp{} = Msg) -> {ok, riak_pb_codec:encode(Msg)}; encode(#rpbreplgetclusteridresp{} = Msg) -> - {ok, - [?PB_MSG_RESP_CLUSTER_ID|riak_repl_pb:encode_rpbreplgetclusteridresp(Msg)]}. + Resp = riak_repl_pb:encode_rpbreplgetclusteridresp(Msg), + {ok, [?PB_MSG_RESP_CLUSTER_ID, Resp]}. %% Process Protocol Buffer Requests %% @@ -68,7 +68,7 @@ process(#rpbreplgetclusteridreq{}, State) -> ClusterId = lists:flatten( io_lib:format("~p", [riak_core_ring:cluster_name(Ring)])), lager:debug("Repl PB: returning cluster id ~p", [ClusterId]), - {reply, #rpbreplgetclusteridresp{cluster_id = ClusterId}, State}; + {reply, #rpbreplgetclusteridresp{cluster_id = list_to_binary(ClusterId)}, State}; %% @doc Return Key/Value pair, derived from the KV version process(#rpbreplgetreq{bucket=B, key=K, r=R0, pr=PR0, notfound_ok=NFOk, basic_quorum=BQ, if_modified=VClock, diff --git a/src/riak_repl_ring.erl b/src/riak_repl_ring.erl index 92f9c16f..388ccd81 100644 --- a/src/riak_repl_ring.erl +++ b/src/riak_repl_ring.erl @@ -35,8 +35,6 @@ fs_enabled/1, set_modes/2, get_modes/1, - compose/2, - multicompose/1, pg_enable_trans/2, pg_disable_trans/2, pg_enabled/1, @@ -495,11 +493,6 @@ del_nat_map(Ring, Mapping) -> get_nat_map(Ring) -> get_list(nat_map, Ring). -%% Function composition -compose(F,G) -> fun(X) -> F(G(X)) end. -multicompose(Fs) -> - lists:foldl(fun compose/2, fun(X) -> X end, Fs). - %% unit tests -ifdef(TEST).