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

clean up some stuff that got hacked while debugging and benchmarking

Browse Source
This commit is contained in:
Chris Tilt 2013-05-15 20:19:48 -04:00
parent 76be9589fd
commit 3fd920efbb
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/repl_aae_fullsync_bench.erl
View File

@ -29,6 +29,7 @@ confirm() ->
},
{riak_repl,
[
%% {fullsync_strategy, keylist},
{fullsync_strategy, aae},
{fullsync_on_connect, false},
{fullsync_interval, disabled}
@ -108,7 +109,7 @@ aae_fs_test([AFirst|_] = ANodes, [BFirst|_] = BNodes, Connected) ->
%% TEST: write data, NOT replicated by RT or fullsync
%% keys: 1..NumKeysAOnly
%%---------------------------------------------------
NumKeysAOnly = 100000,
NumKeysAOnly = 1000000,
lager:info("Writing ~p keys to A(~p)", [NumKeysAOnly, AFirst]),
?assertEqual([], repl_util:do_write(AFirst, 1, NumKeysAOnly, TestBucket, 2)),
@ -122,7 +123,7 @@ aae_fs_test([AFirst|_] = ANodes, [BFirst|_] = BNodes, Connected) ->
%% TEST: write data, replicated by RT
%% keys: NumKeysAOnly+1..NumKeysAOnly+NumKeysBoth
%%-----------------------------------------------
NumKeysBoth = 1000000,
NumKeysBoth = 0,
%% Enable and start Real-time replication
repl_util:enable_realtime(LeaderA, "B"),
@ -166,11 +167,11 @@ aae_fs_test([AFirst|_] = ANodes, [BFirst|_] = BNodes, Connected) ->
lager:info("Fullsync completed in ~p seconds", [Time/1000/1000]),
%% verify data is replicated to B
%% log_to_nodes(AllNodes, "Verify: Reading ~p keys repl'd from A(~p) to B(~p)",
%% [NumKeysAOnly, LeaderA, BFirst]),
%% lager:info("Verify: Reading ~p keys repl'd from A(~p) to B(~p)",
%% [NumKeysAOnly, LeaderA, BFirst]),
%% ?assertEqual(0, repl_util:wait_for_reads(BFirst, 1, NumKeysAOnly, TestBucket, 2)),
NumKeysToVerify = min(1000, NumKeysAOnly),
log_to_nodes(AllNodes, "Verify: Reading ~p keys repl'd from A(~p) to B(~p)",
[NumKeysToVerify, LeaderA, BFirst]),
lager:info("Verify: Reading ~p keys repl'd from A(~p) to B(~p)",
[NumKeysToVerify, LeaderA, BFirst]),
?assertEqual(0, repl_util:wait_for_reads(BFirst, 1, NumKeysToVerify, TestBucket, 2)),
ok.

7
tests/replication2.erl
View File

@ -150,8 +150,8 @@ replication([AFirst|_] = ANodes, [BFirst|_] = BNodes, Connected) ->
rt:wait_until_ring_converged(ANodes),
lager:info("write 1000000 keys"),
?assertEqual([], repl_util:do_write(LeaderA, 50000, 150000,
lager:info("write 2000 keys"),
?assertEqual([], repl_util:do_write(LeaderA, 50000, 52000,
TestBucket, 2)),
lager:info("reconnect the 2 clusters"),
@ -166,9 +166,6 @@ replication([AFirst|_] = ANodes, [BFirst|_] = BNodes, Connected) ->
rt:wait_until_ring_converged(ANodes),
?assertEqual(ok, repl_util:wait_until_connection(LeaderA)),
lager:info("Ready for manual testing."),
timer:sleep(1000000),
repl_util:start_and_wait_until_fullsync_complete(LeaderA),
lager:info("read 2000 keys"),