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

Fix overlapping key ranges in replication test.

Browse Source 
Fix overlapping key ranges which cause sibling generation because of
puts with no vclock.  Add additional checking to assert this is true.
This commit is contained in:
Christopher Meiklejohn 2014-01-21 20:22:17 -05:00
parent cf515c14ea
commit ba45350da3
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tests/replication2.erl
View File

@ -378,7 +378,6 @@ replication([AFirst|_] = ANodes, [BFirst|_] = BNodes, Connected) ->
Res10 = rt:systest_read(BSecond, 1, 100, RealtimeOnly, 2), Res10 = rt:systest_read(BSecond, 1, 100, RealtimeOnly, 2),
?assertEqual(100, length(Res10)), ?assertEqual(100, length(Res10)),
lager:info("Write 100 more keys into realtime only bucket on ~p", lager:info("Write 100 more keys into realtime only bucket on ~p",
[ASecond]), [ASecond]),
?assertEqual([], repl_util:do_write(ASecond, 101, 200, ?assertEqual([], repl_util:do_write(ASecond, 101, 200,
@ -408,8 +407,7 @@ replication([AFirst|_] = ANodes, [BFirst|_] = BNodes, Connected) ->
rt:wait_until_ring_converged(ANodes), rt:wait_until_ring_converged(ANodes),
lager:info("Writing 100 keys"), lager:info("Writing 100 keys"),
?assertEqual([], repl_util:do_write(LeaderA4, 800, 900, ?assertEqual([], repl_util:do_write(LeaderA4, 800, 900, TestBucket, 2)),
TestBucket, 2)),
lager:info("Starting realtime"), lager:info("Starting realtime"),
repl_util:start_realtime(LeaderA4, "B"), repl_util:start_realtime(LeaderA4, "B"),
@ -428,9 +426,17 @@ replication([AFirst|_] = ANodes, [BFirst|_] = BNodes, Connected) ->
repl_util:stop_realtime(LeaderA4, "B"), repl_util:stop_realtime(LeaderA4, "B"),
rt:wait_until_ring_converged(ANodes), rt:wait_until_ring_converged(ANodes),
lager:info("Writing 100 keys"), lager:info("Verifying 100 keys are missing from ~p", [Target]),
?assertEqual([], repl_util:do_write(Target, 900, 1000, repl_util:read_from_cluster(Target, 901, 1000, TestBucket, 100),
TestBucket, 2)),
lager:info("Writing 100 keys to ~p", [Target]),
?assertEqual([], repl_util:do_write(Target, 901, 1000, TestBucket, 2)),
lager:info("Verifying 100 keys are read from ~p", [Target]),
repl_util:read_from_cluster(Target, 901, 1000, TestBucket, 0),
lager:info("Verifying 100 keys are missing from ~p", [BSecond]),
repl_util:read_from_cluster(BSecond, 901, 1000, TestBucket, 100),
io:format("queue status: ~p", io:format("queue status: ~p",
[rpc:call(Target, riak_repl2_rtq, status, [])]), [rpc:call(Target, riak_repl2_rtq, status, [])]),
@ -444,9 +450,11 @@ replication([AFirst|_] = ANodes, [BFirst|_] = BNodes, Connected) ->
repl_util:start_realtime(LeaderA4, "B"), repl_util:start_realtime(LeaderA4, "B"),
timer:sleep(3000), timer:sleep(3000),
lager:info("Verifying 100 keys are now available on ~p", [BSecond]),
repl_util:read_from_cluster(BSecond, 901, 1000, TestBucket, 0),
lager:info("Reading keys written while repl was stopped"), lager:info("Reading keys written while repl was stopped"),
?assertEqual(0, repl_util:wait_for_reads(BSecond, 900, 1000, ?assertEqual(0, repl_util:wait_for_reads(BSecond, 901, 1000, TestBucket, 2)),
TestBucket, 2)),
lager:info("Restarting node ~p", [Target]), lager:info("Restarting node ~p", [Target]),