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

Merge pull request #700 from basho/bugfix/csm/gossip-convergence

Browse Source 
Resolve race condition.
This commit is contained in:
Christopher Meiklejohn 2014-11-06 13:48:05 -08:00
commit c51f057548
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
tests/repl_bucket_types.erl
View File

@ -126,11 +126,11 @@ realtime_test({ClusterNodes, BucketTypes, PBA, PBB}) ->
DefaultProps = get_current_bucket_props(BNodes, DefinedType),
?assertEqual({n_val, 3}, lists:keyfind(n_val, 1, DefaultProps)),
UpdatedProps = update_props(DefinedType,
[{n_val, 1}],
LeaderB,
BNodes),
?assertEqual({n_val, 1}, lists:keyfind(n_val, 1, UpdatedProps)),
update_props(DefinedType, [{n_val, 1}], LeaderB, BNodes),
ok = rt:wait_until(fun() ->
UpdatedProps = get_current_bucket_props(BNodes, DefinedType),
{n_val, 1} =:= lists:keyfind(n_val, 1, UpdatedProps)
end),
UnequalObjBin = <<"unequal props val">>,
UnequalPropsObj = riakc_obj:new(BucketTyped, KeyTyped, UnequalObjBin),
@ -142,12 +142,11 @@ realtime_test({ClusterNodes, BucketTypes, PBA, PBB}) ->
ensure_bucket_not_updated(PBB, BucketTyped, KeyTyped, Bin),
disable_rt(LeaderA, ANodes),
UpdatedProps2 = update_props(DefinedType,
[{n_val, 3}],
LeaderB,
BNodes),
?assertEqual({n_val, 3}, lists:keyfind(n_val, 1, UpdatedProps2)),
?assertEqual({n_val, 3}, lists:keyfind(n_val, 1, UpdatedProps2)),
update_props(DefinedType, [{n_val, 3}], LeaderB, BNodes),
ok = rt:wait_until(fun() ->
UpdatedProps2 = get_current_bucket_props(BNodes, DefinedType),
{n_val, 3} =:= lists:keyfind(n_val, 1, UpdatedProps2)
end),
disable_rt(LeaderA, ANodes).
@ -236,8 +235,11 @@ fullsync_test({ClusterNodes, BucketTypes, PBA, PBB}) ->
DefaultProps = get_current_bucket_props(BNodes, DefinedType),
?assertEqual({n_val, 3}, lists:keyfind(n_val, 1, DefaultProps)),
UpdatedProps = update_props(DefinedType, [{n_val, 1}], LeaderB, BNodes),
?assertEqual({n_val, 1}, lists:keyfind(n_val, 1, UpdatedProps)),
update_props(DefinedType, [{n_val, 1}], LeaderB, BNodes),
ok = rt:wait_until(fun() ->
UpdatedProps = get_current_bucket_props(BNodes, DefinedType),
{n_val, 1} =:= lists:keyfind(n_val, 1, UpdatedProps)
end),
UnequalObjBin = <<"unequal props val">>,
UnequalPropsObj = riakc_obj:new(BucketTyped, KeyTyped, UnequalObjBin),
@ -459,10 +461,7 @@ get_current_bucket_props(Node, Type) when is_atom(Node) ->
ensure_rtq_drained(ANodes) ->
lager:info("making sure the rtq has drained"),
Got = lists:map(fun(Node) ->
case rpc:call(Node, riak_repl2_rtq, dumpq, []) of
[] -> true;
_ -> false
end
[] =:= rpc:call(Node, riak_repl2_rtq, dumpq, [])
end, ANodes),
Expected = [true || _ <- lists:seq(1, length(ANodes))],
?assertEqual(Expected, Got).