Checkpoint.

Author: cmeiklejohn

riak_test.config.sample examples/riak_test.config

@@ -1,5 +1,5 @@
 -module(get_put).
--compile(export_all).
+-export([confirm/0]).
 -include_lib("eunit/include/eunit.hrl").
 
 -define(HARNESS, (rt_config:get(rt_harness))).
@@ -9,7 +9,8 @@ confirm() ->
     HostList = rt_config:get(rt_hostnames),
     Count = length(HostList),
 
-    _Config = rtperf:standard_config(Count),
+    Config = rtperf:standard_config(Count),
+    lager:info("Generated configuration is: ~p", [Config]),
 
     [Nodes] = rt:build_clusters([Count]),
     lager:info("Built cluster: ~p", [Nodes]),

riak_test.config.example examples/riak_test.config.perf

@@ -12,5 +12,4 @@ fi
 D1=`basename "$1"`
 
 #generate our comparison graph
-echo gnuplot -e "dir1=\"$1\"; outfilename=\"${D1}-report.png\";" priv/reporting/summarize1.gpl
 gnuplot -e "dir1=\"$1\"; outfilename=\"${D1}-report.png\";" priv/reporting/summarize1.gpl

perf/get_put.erl

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-cp riak_test.config.example ~/.riak_test.config && make clean && make && ./riak_test -c rtperf -t get_put -v
+cp examples/riak_test.config.perf ~/.riak_test.config && make clean && make && ./riak_test -c rtperf -t get_put -v

priv/reporting/report.sh

@@ -388,8 +388,6 @@ message_queues([Pid|Pids], Threshold, VNodeMap, Queues) ->
 get_network() ->
     {ok, RX} = file:read_file("/sys/class/net/eth0/statistics/rx_bytes"),
     {ok, TX} = file:read_file("/sys/class/net/eth0/statistics/tx_bytes"),
-    % {ok, RX} = file:read_file("/sys/class/net/eth1/statistics/rx_bytes"),
-    % {ok, TX} = file:read_file("/sys/class/net/eth1/statistics/tx_bytes"),
     {to_integer(RX), to_integer(TX)}.
 
 get_disk2() ->

run-perf-test.sh

@@ -72,7 +72,7 @@ bench(Config, NodeList, TestName, Runners, Drop) ->
                     {0, R} = rtssh:ssh_cmd(LG, Cmd, false),
                     lager:info("bench run finished, on ~p returned ~p",
                    [LG, R]),
-                    % {0, _} = rtssh:ssh_cmd(LG, "rm -r "++BBTmp++"/"),
+                    {0, _} = rtssh:ssh_cmd(LG, "rm -r "++BBTmp++"/"),
             Owner ! {done, ok}
                 catch
                     Class:Error ->