valitydev/riak_test
14
0
Fork 0
mirror of https://github.com/valitydev/riak_test.git synced 2024-11-06 16:45:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #628 from basho/bugfix/ensemble-timouts

Browse Source 
increase timeouts for SC operations in ensemble tests
This commit is contained in:
Andrew J. Stone 2014-06-03 13:29:49 -04:00
commit 2c7fc9fb4b
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/ensemble_sync.erl
View File

@ -71,7 +71,7 @@ run_scenario(Nodes, NVal, {NumKill, NumSuspend, NumValid, _, Name, Expect}) ->
io:format("PL: ~p~n", [PL]),
PBC = rt:pbc(Node),
Options = [{timeout, 500}],
Options = [{timeout, 2000}],
rpc:multicall(Nodes, riak_kv_entropy_manager, set_mode, [manual]),
Part = rt:partition(Nodes -- Partitioned, Partitioned),

6
tests/ensemble_util.erl
View File

@ -95,7 +95,8 @@ wait_until_stable(Node, Count) ->
wait_until_quorum(Node, Ensemble) ->
F = fun() ->
case rpc:call(Node, riak_ensemble_manager, check_quorum, [Ensemble, 500]) of
case rpc:call(Node, riak_ensemble_manager, check_quorum,
[Ensemble, 10000]) of
true ->
true;
false ->
@ -107,7 +108,8 @@ wait_until_quorum(Node, Ensemble) ->
wait_until_quorum_count(Node, Ensemble, Want) ->
F = fun() ->
case rpc:call(Node, riak_ensemble_manager, count_quorum, [Ensemble, 1500]) of
case rpc:call(Node, riak_ensemble_manager, count_quorum,
[Ensemble, 10000]) of
Count when Count >= Want ->
true;
Count ->