Merge pull request #30 from basho/ss-fix-opt-timeout-arg-mismatch

Fix missing "options" arg for a few calls

src/machi_basho_bench_driver.erl

@@ -112,7 +112,7 @@ run(read, KeyGen, _ValueGen, #m{conn=Conn, max_key=MaxKey}=S) ->
     Idx = KeyGen() rem MaxKey,
     %% {File, Offset, Size, _CSum} = ets:lookup_element(?ETS_TAB, Idx, 2),
     {File, Offset, Size} = ets:lookup_element(?ETS_TAB, Idx, 2),
-    case machi_cr_client:read_chunk(Conn, File, Offset, Size, ?THE_TIMEOUT) of
+    case machi_cr_client:read_chunk(Conn, File, Offset, Size, [], ?THE_TIMEOUT) of
         {ok, _Chunk} ->
             {ok, S};
         {error, _}=Err ->

src/machi_chain_repair.erl

@@ -327,7 +327,7 @@ execute_repair_directive({File, Cmds}, {ProxiesDict, EpochID, Verb, ETS}=Acc) ->
                 %% TODO: support case multiple written or trimmed chunks returned
                 {ok, {[{_, Offset, Chunk, _}], _}} =
                     machi_proxy_flu1_client:read_chunk(
-                      SrcP, EpochID, File, Offset, Size,
+                      SrcP, EpochID, File, Offset, Size, [],
                       ?SHORT_TIMEOUT),
                 _T2 = os:timestamp(),
                 <<_Tag:1/binary, CSum/binary>> = TaggedCSum,

src/machi_cr_client.erl

@@ -595,7 +595,7 @@ read_repair2(cp_mode=ConsistencyMode,
     %% TODO WTF was I thinking here??....
     Tail = lists:last(readonly_flus(P)),
     case ?FLU_PC:read_chunk(orddict:fetch(Tail, PD), EpochID,
-                            File, Offset, Size, ?TIMEOUT) of
+                            File, Offset, Size, [], ?TIMEOUT) of
         {ok, Chunks} when is_list(Chunks) ->
             ToRepair = mutation_flus(P) -- [Tail],
             {Reply, S1} = do_repair_chunks(Chunks, ToRepair, ReturnMode,