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

Simplify the SNMP test to reduce number of RPCs we do in each iteration.

Browse Source
This commit is contained in:
Sean Cribbs 2013-01-23 09:36:37 -06:00
parent 0c4dd17886
commit d5ea92d2ff
1 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
tests/verify_snmp.erl
View File

@ -30,12 +30,6 @@ confirm() ->
[Node1] = rt:deploy_nodes(1), [Node1] = rt:deploy_nodes(1),
?assertEqual(ok, rt:wait_until_nodes_ready([Node1])), ?assertEqual(ok, rt:wait_until_nodes_ready([Node1])),
lager:info("Doing some reads and writes to record some stats."),
rt:systest_write(Node1, 10),
rt:systest_read(Node1, 10),
Stats = get_stats(Node1),
Keys = [{vnodeGets,<<"vnode_gets">>}, Keys = [{vnodeGets,<<"vnode_gets">>},
{vnodePuts,<<"vnode_puts">>}, {vnodePuts,<<"vnode_puts">>},
{nodeGets,<<"node_gets">>}, {nodeGets,<<"node_gets">>},
@ -50,31 +44,44 @@ confirm() ->
{nodePutTime95,<<"node_put_fsm_time_95">>}, {nodePutTime95,<<"node_put_fsm_time_95">>},
{nodePutTime99,<<"node_put_fsm_time_99">>}, {nodePutTime99,<<"node_put_fsm_time_99">>},
{nodePutTime100,<<"node_put_fsm_time_100">>}], {nodePutTime100,<<"node_put_fsm_time_100">>}],
verify_eq(Stats, Keys, Node1),
lager:info("Waiting for SNMP to start."),
rpc:call(Node1, riak_core, wait_for_application, [snmp]),
rpc:call(Node1, riak_core, wait_for_application, [riak_snmp]),
lager:info("Mapping SNMP names to OIDs"),
OIDPairs = [ begin
{value, OID} = rpc:call(Node1, snmpa, name_to_oid, [SKey]),
{OID ++ [0], HKey}
end || {SKey, HKey} <- Keys ],
lager:info("Doing some reads and writes to record some stats."),
rt:systest_write(Node1, 10),
rt:systest_read(Node1, 10),
lager:info("Fetching HTTP stats"),
Stats = get_stats(Node1),
lager:info("Waiting for stats to propagate to SNMP"),
verify_eq(Stats, OIDPairs, Node1),
pass. pass.
verify_eq(Stats, Keys, Node) -> verify_eq(Stats, Keys, Node) ->
[ begin {OIDs, HKeys} = lists:unzip(Keys),
Http = proplists:get_value(StatKey, Stats), ?assertEqual(ok,
lager:info("Waiting until ~p matches HTTP value: ~p", [SnmpKey, Http]), rt:wait_until(Node,
?assertEqual(ok, wait_until_stat_matches(Node, SnmpKey, Http)) fun(N) ->
end SStats = rpc:call(N, snmpa, get, [snmp_master_agent, OIDs]),
|| {SnmpKey, StatKey} <- Keys]. SPairs = lists:zip(SStats, HKeys),
lists:all(fun({A,B}) -> A == proplists:get_value(B, Stats) end, SPairs)
end)).
get_stats(Node) -> get_stats(Node) ->
StatString = os:cmd(io_lib:format("curl -s -S ~s/stats", [rt:http_url(Node)])), StatString = os:cmd(io_lib:format("curl -s -S ~s/stats", [rt:http_url(Node)])),
{struct, Stats} = mochijson2:decode(StatString), {struct, Stats} = mochijson2:decode(StatString),
Stats. Stats.
get_snmp(Node, StatName) ->
{value, OID} = rpc:call(Node, snmpa, name_to_oid, [StatName]),
[Stat] = rpc:call(Node, snmpa, get, [snmp_master_agent, [OID ++ [0]]]),
Stat.
wait_until_stat_matches(Node, SnmpKey, Http) ->
rt:wait_until(Node,
fun(N) ->
Snmp = get_snmp(N, SnmpKey),
lager:debug("SNMP: ~p is ~p", [SnmpKey, Snmp]),
Http == Snmp
end).