Skip to content

Commit 92fb591

Browse files
committed
fix test node creation
1 parent 13e0d50 commit 92fb591

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ ebin
44
.eunit
55
*.beam
66
*.swp
7+
erl_crash.dump
78

src/rafter.erl

+6-4
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
-export([append/2, start_node/2]).
77

88
%% Test API
9-
-export([start_cluster/0, start_test_node/0]).
9+
-export([start_cluster/0, start_test_node/1]).
1010

1111
%% @doc Only use this during testing
1212
start_cluster() ->
1313
application:start(lager),
1414
application:start(rafter),
1515
rafter_sup:start_cluster().
1616

17-
start_test_node() ->
17+
start_test_node(Name) ->
1818
application:start(lager),
1919
application:start(rafter),
20-
Me = {peer1, node()},
20+
Me = {Name, node()},
2121
Peers = test_peers(Me),
2222
start_node(Me, Peers).
2323

@@ -28,5 +28,7 @@ append(_LocalPeer, _Command) ->
2828
ok.
2929

3030
test_peers(Me) ->
31-
Peers = [{Name, node()} || Name <- [peer1, peer2, peer3, peer4, peer5]],
31+
[_Name, Domain] = string:tokens(atom_to_list(node()), "@"),
32+
Peers = [{list_to_atom(Name), list_to_atom(Name ++ "@" ++ Domain)} ||
33+
Name <- ["peer1", "peer2", "peer3", "peer4", "peer5"]],
3234
lists:delete(Me, Peers).

src/rafter_consensus_fsm.erl

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ follower(#append_entries{term=Term, from=From, prev_log_index=PrevLogIndex,
149149
{reply, NewRpy, follower, State4, Duration}
150150
end;
151151

152-
%% Handle append requests from users. Transparently redirect to leader.
152+
%% Handle append requests from users. Redirect to leader.
153153
follower({append, _Command}, _From, #state{leader=undefined}=State) ->
154154
{reply, {error, election_in_progress}, follower, State, ?timeout()};
155155
follower({append, _Command}, _From, #state{leader=Leader}=State) ->

src/rafter_requester.erl

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ send(To, From, Msg) ->
1818
is_record(Rpy, append_entries_rpy) ->
1919
rafter_consensus_fsm:send(From, Rpy);
2020
E ->
21-
E
21+
lager:error("Error sending ~p to To ~p: ~p", [Msg, To, E])
2222
end
2323
end).

0 commit comments

Comments
 (0)