Add dvv_enabled flag to help run sibling_benchmark

TI-Tokyo · Dec 16, 2015 · 80a9daa · 80a9daa
1 parent 1a1a56f
commit 80a9daa
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/riak_test/tests/sibling_benchmark.erl b/riak_test/tests/sibling_benchmark.erl
@@ -29,6 +29,7 @@
 %%       [{write_concurrency, 2},
 %%        {duration_sec, 30},
 %%        {leave_and_join, 0}, %% number of cluster membership change during the benchmark
+%%        {dvv_enabled, true},
 %%        {version, previous}]
 %%        %%{version, current}]
 %%      },
@@ -52,12 +53,20 @@ confirm() ->
     Duration = proplists:get_value(duration_sec, RTConfig, 16),
     ?assert(is_integer(Duration) andalso Duration >= 0),
 
+    DVVEnabled = proplists:get_value(dvv_enabled, RTConfig, true),
+    ?assert(is_boolean(DVVEnabled)),
+
     Config = [{cs,
                [{riak_cs,
                  [{leeway_seconds, 5},
                   {gc_interval, 10},
                   {connection_pools, [{request_pool, {Concurrency*2 + 5, 0}}]}
-                 ]}]}],
+                 ]}]},
+              {riak,
+               [{riak_core,
+                 [{default_bucket_props,
+                   [{allow_mult, true}, {dvv_enabled, DVVEnabled}]}]}
+               ]}],
     {UserConfig, {RiakNodes, CSNodes, _Stanchion}} =
         case proplists:get_value(version, RTConfig, current) of
             current ->
@@ -79,7 +88,8 @@ confirm() ->
     lager:info("====================== run benchmark ====================="),
     {ok, Pid} = start_stats_checker(RiakNodes),
 
-    lager:info("write_concurrency: ~p, write_interval: ~p msec", [Concurrency, Interval]),
+    lager:info("write_concurrency: ~p, write_interval: ~p msec, DVV: ~p",
+               [Concurrency, Interval, DVVEnabled]),
 
     Writers = [start_object_writer(UserConfig, Interval) || _ <- lists:seq(1, Concurrency)],
     {ok, Reader} = start_object_reader(UserConfig),