valitydev/riak_test
14
0
Fork 0
mirror of https://github.com/valitydev/riak_test.git synced 2024-11-07 08:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #100 from basho/sdc-pending-transfers

Browse Source 
Increase stability / reliability of building a cluster
This commit is contained in:
Sean Cribbs 2012-11-28 13:54:17 -08:00
commit 8b3ba70113
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/rt.erl
View File

@ -112,6 +112,7 @@
wait_until_ready/1, wait_until_ready/1,
wait_until_ring_converged/1, wait_until_ring_converged/1,
wait_until_status_ready/1, wait_until_status_ready/1,
wait_until_transfers_complete/1,
wait_until_unpingable/1, wait_until_unpingable/1,
whats_up/0 whats_up/0
]). ]).
@ -456,14 +457,25 @@ wait_until_status_ready(Node) ->
%% @doc Given a list of nodes, wait until all nodes believe there are no %% @doc Given a list of nodes, wait until all nodes believe there are no
%% on-going or pending ownership transfers. %% on-going or pending ownership transfers.
-spec wait_until_no_pending_changes([node()]) -> ok | fail. -spec wait_until_no_pending_changes([node()]) -> ok | fail.
wait_until_no_pending_changes(Nodes) -> wait_until_no_pending_changes(Nodes0) ->
F = fun(Node) -> F = fun(Nodes) ->
[rpc:call(NN, riak_core_vnode_manager, force_handoffs, []) rpc:multicall(Nodes, riak_core_vnode_manager, force_handoffs, []),
|| NN <- Nodes], {Rings, BadNodes} = rpc:multicall(Nodes, riak_core_ring_manager, get_raw_ring, []),
{ok, Ring} = rpc:call(Node, riak_core_ring_manager, get_raw_ring, []), Changes = [ riak_core_ring:pending_changes(Ring) =:= [] || {ok, Ring} <- Rings ],
riak_core_ring:pending_changes(Ring) =:= [] BadNodes =:= [] andalso length(Changes) =:= length(Nodes) andalso lists:all(fun(T) -> T end, Changes)
end, end,
[?assertEqual(ok, wait_until(Node, F)) || Node <- Nodes], ?assertEqual(ok, wait_until(Nodes0, F)),
ok.
%% @doc Waits until no transfers are in-flight or pending, checked by
%% riak_core_status:transfers().
-spec wait_until_transfers_complete([node()]) -> ok | fail.
wait_until_transfers_complete([Node0|_]) ->
F = fun(Node) ->
{DownNodes, Transfers} = rpc:call(Node, riak_core_status, transfers, []),
DownNodes =:= [] andalso Transfers =:= []
end,
?assertEqual(ok, wait_until(Node0, F)),
ok. ok.
wait_for_service(Node, Service) -> wait_for_service(Node, Service) ->