From ed112bfb52b7536591350c58601fa6a198cfe445 Mon Sep 17 00:00:00 2001 From: Scott Lystig Fritchie Date: Wed, 14 Oct 2015 14:16:51 +0900 Subject: [PATCH] Argument fix for read_chunk() when write_chunk() says 'written' --- src/machi_flu1_client.erl | 1 - src/machi_proxy_flu1_client.erl | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/machi_flu1_client.erl b/src/machi_flu1_client.erl index 1872be0..cc9f175 100644 --- a/src/machi_flu1_client.erl +++ b/src/machi_flu1_client.erl @@ -554,7 +554,6 @@ write_chunk2(Sock, EpochID, File0, Offset, Chunk0) -> {Tag, CS} = machi_util:unmake_tagged_csum(ChunkCSum), {Chk, Tag, CS} end, - %% io:format(user, "\n~s LINE ~w eid ~w File ~w Offset ~w Chunk0 ~w\n", [?MODULE, ?LINE, EpochID, File, Offset, Chunk0]), Req = machi_pb_translate:to_pb_request( ReqID, {low_write_chunk, EpochID, File, Offset, Chunk, CSum_tag, CSum}), diff --git a/src/machi_proxy_flu1_client.erl b/src/machi_proxy_flu1_client.erl index 88444e9..aa9f776 100644 --- a/src/machi_proxy_flu1_client.erl +++ b/src/machi_proxy_flu1_client.erl @@ -298,7 +298,8 @@ write_chunk(PidSpec, EpochID, File, Offset, Chunk, Timeout) -> case gen_server:call(PidSpec, {req, {write_chunk, EpochID, File, Offset, Chunk}}, Timeout) of {error, written}=Err -> - case read_chunk(PidSpec, EpochID, File, Offset, Chunk, Timeout) of + Size = byte_size(Chunk), + case read_chunk(PidSpec, EpochID, File, Offset, Size, Timeout) of {ok, Chunk2} when Chunk2 == Chunk -> %% See equivalent comment inside write_projection(). ok;