diff options
| author | Brad Anderson <brad@cloudant.com> | 2010-05-05 17:54:16 -0400 |
|---|---|---|
| committer | Brad Anderson <brad@cloudant.com> | 2010-05-09 22:56:25 -0400 |
| commit | b8c3322645395de3775ad8b302133a8d80a39fef (patch) | |
| tree | 6bb35f0a938bf8ebd06445e6f7fbde1d7a1f4c14 /src | |
| parent | ccf67d04af1cb14d91ba5a5ac1c4bc85317ffe01 (diff) | |
add 0.5sec sleep to ping_all, seems to have solved 'init' bug picked up by integration tester
Diffstat (limited to 'src')
| -rw-r--r-- | src/mem3.erl | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/mem3.erl b/src/mem3.erl index b2aa4394..b932ca9b 100644 --- a/src/mem3.erl +++ b/src/mem3.erl @@ -348,6 +348,13 @@ int_join(ExtNodes, #mem{nodes=Nodes, clock=Clock} = State) -> {ok, NewState}. +install_new_state(#mem{args=Args} = State) -> + Config = get_config(Args), + Test = get_test(Args), + save_state_file(Test, State, Config), + gossip(Test, State). + + get_pingnode_state(PingNode) -> % ping the PingNode and get its state pong = net_adm:ping(PingNode), @@ -411,6 +418,7 @@ gossip(#mem{args=Args} = NewState) -> gossip(undefined, #mem{nodes=StateNodes} = State) -> {_, Nodes, _} = lists:unzip3(StateNodes), TargetNode = next_up_node(Nodes), + ?debugFmt("~nNodes: ~p~nTarget: ~p~n", [Nodes, TargetNode]), showroom_log:message(info, "membership: firing gossip from ~p to ~p", [node(), TargetNode]), case gen_server:call({?SERVER, TargetNode}, {gossip, State}) of @@ -481,13 +489,6 @@ read_latest_state_file(_, _) -> nil. -install_new_state(#mem{args=Args} = State) -> - Config = get_config(Args), - Test = get_test(Args), - save_state_file(Test, State, Config), - gossip(State). - - %% @doc save the state file to disk, with current timestamp. %% thx to riak_ring_manager:do_write_ringfile/1 -spec save_state_file(test(), mem_state(), config()) -> ok. @@ -531,7 +532,10 @@ int_reset(_Test, State) -> ping_all_yall(Nodes) -> - lists:map(fun(Node) -> net_adm:ping(Node) end, Nodes). + lists:foreach(fun(Node) -> + net_adm:ping(Node) + end, Nodes), + timer:sleep(500). % sigh. get_remote_states(NodeList) -> |