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

Allow all nodes in the cluster to be check the server_fullsyncs because the stat only gets incremented on the node that executed the fullsync.

Browse Source
This commit is contained in:
andytill 2016-12-13 17:07:24 +00:00
parent ccf76dfe8c
commit a98eb3de31
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tests/repl_util.erl
View File

@ -226,6 +226,8 @@ get_fs_coord_status_item(Node, SinkName, ItemName) ->
ClusterProps = proplists:get_value(SinkName, FS_CoordProps),
proplists:get_value(ItemName, ClusterProps).
start_and_wait_until_fullsync_complete(Node) ->
start_and_wait_until_fullsync_complete(Node, undefined).
@ -235,7 +237,9 @@ start_and_wait_until_fullsync_complete(Node, Cluster) ->
start_and_wait_until_fullsync_complete(Node, Cluster, NotifyPid) ->
start_and_wait_until_fullsync_complete(Node, Cluster, NotifyPid, 20).
start_and_wait_until_fullsync_complete(Node, Cluster, NotifyPid, Retries) ->
start_and_wait_until_fullsync_complete(Node, Cluster, NotifyPid, Retries) when is_atom(Node) ->
start_and_wait_until_fullsync_complete([Node], Cluster, NotifyPid, Retries);
start_and_wait_until_fullsync_complete([Node|_] = Nodes, Cluster, NotifyPid, Retries) ->
Status0 = rpc:call(Node, riak_repl_console, status, [quiet]),
Count0 = proplists:get_value(server_fullsyncs, Status0),
Count = fullsync_count(Count0, Status0, Cluster),
@ -252,7 +256,7 @@ start_and_wait_until_fullsync_complete(Node, Cluster, NotifyPid, Retries) ->
%% Send message to process and notify fullsync has began.
fullsync_notify(NotifyPid),
case rt:wait_until(make_fullsync_wait_fun(Node, Count), 100, 1000) of
case rt:wait_until(make_fullsync_wait_fun(Nodes, Count), 100, 1000) of
ok ->
ok;
_ when Retries > 0 ->
@ -281,19 +285,24 @@ fullsync_notify(NotifyPid) when is_pid(NotifyPid) ->
fullsync_notify(_) ->
ok.
make_fullsync_wait_fun(Node, Count) ->
make_fullsync_wait_fun(Cluster, Count) when is_list(Cluster) ->
fun() ->
Status = rpc:call(Node, riak_repl_console, status, [quiet]),
case Status of
{badrpc, _} ->
false;
make_fullsync_wait_fun2(Cluster, Count)
end.
make_fullsync_wait_fun2([], _) ->
false;
make_fullsync_wait_fun2([Node|Tail], Count) when is_atom(Node) ->
Status = rpc:call(Node, riak_repl_console, status, [quiet]),
case Status of
{badrpc, _} ->
false;
_ ->
case proplists:get_value(server_fullsyncs, Status) of
C when C >= Count ->
true;
_ ->
case proplists:get_value(server_fullsyncs, Status) of
C when C >= Count ->
true;
_ ->
false
end
make_fullsync_wait_fun2(Tail, Count)
end
end.

4
tests/ts_cluster_replication.erl
View File

@ -207,7 +207,7 @@ full_sync_replication_test([AFirst|_]=ANodes, [BFirst|_]=BNodes, LeaderA, PortB,
lager:info("Starting and waiting for fullsync"),
connect_clusters(ANodes, BNodes, LeaderA, PortB),
start_mdc(ANodes, LeaderA, "B", true),
repl_util:start_and_wait_until_fullsync_complete(hd(ANodes), "B"),
repl_util:start_and_wait_until_fullsync_complete(ANodes, "B"),
lager:info("Verifying first 100 keys present on 2nd cluster (non-w1c)"),
?assertEqual(100, kv_num_objects_present(BNode, 1, 100, KVBucket)),
@ -221,7 +221,7 @@ full_sync_replication_test([AFirst|_]=ANodes, [BFirst|_]=BNodes, LeaderA, PortB,
timer:sleep(500),
lager:info("Verifying record is no longer on Cluster A"),
?assertEqual(0, ts_num_records_present(AFirst, 23, 23, Table)),
repl_util:start_and_wait_until_fullsync_complete(hd(ANodes), "B"),
repl_util:start_and_wait_until_fullsync_complete(ANodes, "B"),
lager:info("Verifying record is no longer on Cluster B"),
?assertEqual(0, ts_num_records_present(BFirst, 23, 23, Table)),