Merge pull request #78 from sogabe/riak_cs_2

Add riak_cs support (imported from riak_cs/bench)

Author: Shunichi Shinohara

examples/cs.config.sample

@@ -0,0 +1,48 @@
+%% Sample config file for Riak CS basho_bench benchmarking
+
+%% About rate limiting via the `mode` setting: the `mode` rate is
+%% valid for the basho_bench_driver_cs plugin for `get` operations.
+%% The `mode` rate does *not* apply to `insert` operations.
+%% The driver does *not* support `update` operations
+
+{mode, max}.
+%{mode, {rate,4}}.
+{duration, 1}.
+{concurrent, 1}.
+{report_interval, 1}.
+
+{driver, basho_bench_driver_cs}.
+
+%% Replace this with a user you have created.
+%% Instructions to create a user are here:
+%% https://github.com/basho/riak_cs/wiki/Creating-a-User
+{cs_access_key, "ZG7SS3ZPECF-8LZOEBMA"}.
+{cs_secret_key, "21HoIRdeO617nJrIbam9mKH2MBxmcsMEwESvmQ=="}.
+{cs_bucket, "test"}. % create this with s3cmd before running basho_bench!
+{cs_disconnect_frequency, 5}.    % # ops before disconnecting HTTP socket
+{cs_raw_ip, "s3.amazonaws.com"}. % DO NOT CHANGE
+{cs_raw_port, 80}.               % DO NOT CHANGE
+%% Replace these with your HTTP proxy's location (i.e. Riak CS)
+{cs_http_proxy_host, [{"localhost", 8080}, {"127.0.0.1", 8080}, {{127,0,0,1}, 8080}]}.
+{cs_http_proxy_port, 8080}.
+{cs_request_timeout, 999999000}.
+% If using the cs_measurement_units option, you need to change
+% any R graph's labels of the Y axis, e.g. basho_bench's Makefile target
+% "make mbyte_sec-results"
+{cs_measurement_units, mbyte_sec}.
+
+{key_generator, {int_to_str, {partitioned_sequential_int, 1000}}}.
+%{key_generator, {int_to_str, {uniform_int, 1000}}}.
+%% See comments in source code for bigfile_valgen() function for full
+%% explanation of the proplist below.
+{value_generator, {function, basho_bench_driver_cs, bigfile_valgen,
+                  [[{file_size, 8001001},
+                    {ibrowse_chunk_size, 1000000},
+                    {max_rate_per_chunk, 50}]]}}.
+
+%% NOTE: It's not a good idea to mix insert & get ops in a single
+%%       basho_bench instance with this driver.
+%%       Use separate ones instead!
+%% bad idea: {operations, [{insert, 1}, {get, 1}]}.
+{operations, [{insert, 1}]}.
+%{operations, [{get, 1}]}.

rebar.config

@@ -10,7 +10,7 @@
   %%       weighed.
   {folsom, ".*", {git, "git://github.com/basho/folsom.git", {branch, "boundary-0.7.1+basho-bench-float"}}},
 
-  {lager, "1.*", {git, "git://github.com/basho/lager", {tag, "1.2.1"}}},
+  {lager, "1.*", {git, "git://github.com/basho/lager", {tag, "1.2.2"}}},
   {ibrowse, ".*",
    {git, "git://github.com/cmullaparthi/ibrowse.git", {tag, "v3.0.4"}}},
   {casbench, "0.1",
@@ -24,14 +24,15 @@
    {git, "git://github.com/basho/riak-erlang-client", {tag, "1.2.1"}}},
   {mochiweb, "1.5.1",
    {git, "git://github.com/basho/mochiweb", {tag, "1.5.1-riak-1.0.x-fixes"}}},
+  {velvet, "1.3.*", {git, "git://github.com/basho/velvet", {tag, "1.3.0"}}},
   {getopt, ".*",
    {git, "git://github.com/jcomellas/getopt", {tag, "v0.4"}}}
  ]}.
 
 {erl_opts, [{src_dirs, [src]},
            {parse_transform, lager_transform}]}.
 
-{escript_incl_apps, [lager, getopt, bear, folsom, ibrowse, riakc, mochiweb, protobuffs ]}.
+{escript_incl_apps, [lager, getopt, bear, folsom, ibrowse, riakc, mochiweb, protobuffs, velvet]}.
 
 %% Uncomment to use the Java client bench driver
 %% {escript_emu_args, "%%! -name bb@127.0.0.1 -setcookie YOUR_ERLANG_COOKIE\n"}.