Merge pull request #131 from basho/develop-3.0-292

Develop 3.0 292

Author: martinsumner

.gitignore

@@ -14,3 +14,4 @@ priv/
 c_src/
 .DS_Store
 log/*\.log
+.eqc-info

.travis.yml

@@ -0,0 +1,8 @@
+language: erlang
+otp_release:
+  - 20.3.8
+  - 21.3
+  - 22.3
+script:
+  - chmod u+x rebar3
+  - ./rebar3 do upgrade, compile, xref, dialyzer, eunit

eqc/sc.erl

@@ -1,5 +1,5 @@
 -module(sc).
--compile(export_all).
+-compile([export_all, nowarn_export_all]).
 
 -ifdef(EQC).
 

rebar.config

@@ -1,5 +1,5 @@
 {erl_opts, [debug_info,
-           %warnings_as_errors,
+           warnings_as_errors,
            warn_untyped_record,
            {platform_define, "^[0-9]+", namespaced_types},
            {parse_transform, lager_transform}]}.
@@ -9,12 +9,11 @@
 {cover_enabled, true}.
 {xref_checks, [undefined_function_calls]}.
 {deps, [
-  gen_fsm_compat,
-  {lager, ".*", {git, "git://github.com/erlang-lager/lager.git", {tag, "3.6.1"}}},
-  {eleveldb, ".*", {git, "git://github.com/basho/eleveldb.git", {branch, "develop-3.0"}}}
+  {lager, {git, "git://github.com/erlang-lager/lager.git", {tag, "3.8.0"}}},
+  {eleveldb, {git, "git://github.com/basho/eleveldb.git", {branch, "develop-3.0"}}}
 ]}.
 
-{plugins, [{rebar3_eqc, {git, "https://github.com/Vagabond/rebar3-eqc-plugin", {branch, "master"}}}, pc]}.
+{plugins, [{eqc_rebar, {git, "https://github.com/Quviq/eqc-rebar", {branch, "master"}}}, pc]}.
 {provider_hooks,
  [
   {pre,

rebar3

@@ -6,7 +6,6 @@
   {applications, [
                   kernel,
                   stdlib,
-                  gen_fsm_compat,
                   lager,
                   eleveldb
                  ]},

src/riak_ensemble.app.src

@@ -22,6 +22,10 @@
 -compile(nowarn_export_all).
 -compile(export_all).
 
+-compile({nowarn_deprecated_function, 
+            [{gen_fsm, sync_send_event, 3},
+                {gen_fsm, send_event, 2}]}).
+
 -include("stacktrace.hrl").
 
 start_exchange(Ensemble, Peer, Id, Tree, Peers, Views, Trusted) ->
@@ -30,7 +34,7 @@ start_exchange(Ensemble, Peer, Id, Tree, Peers, Views, Trusted) ->
                       perform_exchange(Ensemble, Peer, Id, Tree, Peers, Views, Trusted)
                   catch ?_exception_(Class, Reason, StackToken) ->
                           io:format("CAUGHT: ~p/~p~n~p~n", [Class, Reason, ?_get_stacktrace_(StackToken)]),
-                          gen_fsm_compat:send_event(Peer, exchange_failed)
+                          gen_fsm:send_event(Peer, exchange_failed)
                   end
           end).
 
@@ -53,7 +57,7 @@ perform_exchange(Ensemble, Peer, Id, Tree, Peers, Views, Trusted) ->
         end,
     case RemotePeers of
         failed ->
-            gen_fsm_compat:send_event(Peer, exchange_failed),
+            gen_fsm:send_event(Peer, exchange_failed),
             ok;
         _ ->
             perform_exchange2(Ensemble, Peer, Id, Tree, RemotePeers)
@@ -65,14 +69,14 @@ perform_exchange2(Ensemble, Peer, Id, Tree, RemotePeers) ->
             exchange(Ensemble, Peer, Id, Tree, RemotePeers);
         false ->
             %% io:format(user, "~p: tree_corrupted (perform_exchange2)~n", [Id]),
-            gen_fsm_compat:sync_send_event(Peer, tree_corrupted, infinity)
+            gen_fsm:sync_send_event(Peer, tree_corrupted, infinity)
     end.
 
 exchange(_Ensemble, Peer, _Id, _Tree, []) ->
-    gen_fsm_compat:send_event(Peer, exchange_complete);
+    gen_fsm:send_event(Peer, exchange_complete);
 exchange(Ensemble, Peer, Id, Tree, [RemotePeer|RemotePeers]) ->
     RemotePid = riak_ensemble_manager:get_peer_pid(Ensemble, RemotePeer),
-    RemoteTree = gen_fsm_compat:sync_send_event(RemotePid, tree_pid, infinity),
+    RemoteTree = gen_fsm:sync_send_event(RemotePid, tree_pid, infinity),
     Local = fun(exchange_get, {L,B}) ->
                     exchange_get(L, B, Peer, Tree);
                (start_exchange_level, _) ->
@@ -104,7 +108,7 @@ exchange(Ensemble, Peer, Id, Tree, [RemotePeer|RemotePeers]) ->
 exchange_get(L, B, PeerPid, Tree) ->
     case riak_ensemble_peer_tree:exchange_get(L, B, Tree) of
         corrupted ->
-            gen_fsm_compat:sync_send_event(PeerPid, tree_corrupted, infinity),
+            gen_fsm:sync_send_event(PeerPid, tree_corrupted, infinity),
             throw(corrupted);
         Hashes ->
             Hashes

src/riak_ensemble_exchange.erl

@@ -22,6 +22,10 @@
 
 -module(riak_ensemble_msg).
 
+-compile({nowarn_deprecated_function, 
+            [{gen_fsm, send_all_state_event, 2},
+                {gen_fsm, send_event, 2}]}).
+
 -export([send_all/4,
          send_all/5,
          blocking_send_all/4,
@@ -85,7 +89,7 @@ send_all(Msg, Id, Peers, Views) ->
 -spec send_all(msg(), peer_id(), peer_pids(), views(), required()) -> msg_state().
 send_all(_Msg, Id, _Peers=[{Id,_}], _Views, _Required) ->
     ?OUT("~p: self-sending~n", [Id]),
-    gen_fsm_compat:send_event(self(), {quorum_met, []}),
+    gen_fsm:send_event(self(), {quorum_met, []}),
     #msgstate{awaiting=undefined, timer=undefined, replies=[], id=Id};
 send_all(Msg, Id, Peers, Views, Required) ->
     ?OUT("~p/~p: sending to ~p: ~p~n", [Id, self(), Peers, Msg]),
@@ -138,7 +142,7 @@ send_request({PeerId, PeerPid}, ReqId, Event) ->
             reply(From, PeerId, nack);
         _ ->
             ?OUT("~p: Sending to ~p: ~p~n", [self(), PeerId, Event]),
-            gen_fsm_compat:send_event(PeerPid, Event)
+            gen_fsm:send_event(PeerPid, Event)
     end.
 
 %%%===================================================================
@@ -172,14 +176,14 @@ send_cast({_PeerId, PeerPid}, Event) ->
             ok;
         _ ->
             ?OUT("~p: Sending to ~p: ~p~n", [self(), _PeerId, Event]),
-            gen_fsm_compat:send_event(PeerPid, Event)
+            gen_fsm:send_event(PeerPid, Event)
     end.
 
 %%%===================================================================
 
 -spec reply(msg_from(), peer_id(), any()) -> ok.
 reply({riak_ensemble_msg, Sender, ReqId}, Id, Reply) ->
-    gen_fsm_compat:send_all_state_event(Sender, {reply, ReqId, Id, Reply}).
+    gen_fsm:send_all_state_event(Sender, {reply, ReqId, Id, Reply}).
 
 %%%===================================================================
 
@@ -349,7 +353,7 @@ add_reply(Peer, Reply, MsgState=#msgstate{timer=Timer}) ->
         true ->
             cancel_timer(Timer),
             {Valid, _Nacks} = find_valid(Replies),
-            gen_fsm_compat:send_event(self(), {quorum_met, Valid}),
+            gen_fsm:send_event(self(), {quorum_met, Valid}),
             MsgState#msgstate{replies=[], awaiting=undefined, timer=undefined};
         false ->
             MsgState#msgstate{replies=Replies};
@@ -361,7 +365,7 @@ add_reply(Peer, Reply, MsgState=#msgstate{timer=Timer}) ->
 -spec quorum_timeout(msg_state()) -> msg_state().
 quorum_timeout(#msgstate{replies=Replies}) ->
     {Valid, _Nacks} = find_valid(Replies),
-    gen_fsm_compat:send_event(self(), {timeout, Valid}),
+    gen_fsm:send_event(self(), {timeout, Valid}),
     #msgstate{awaiting=undefined, timer=undefined, replies=[]}.
 
 %%%===================================================================