greg/machi
1
0
Fork 0
Code Issues 11 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Fix "HEY, machi_pb_translate:852 got {error,bad_csum}" errors

Browse source 
s/bad_csum/bad_checksum/ as needed in in machi_file_proxy.erl
This commit is contained in:
Scott Lystig Fritchie 2015-10-14 14:26:46 +09:00
parent ed112bfb52
commit 8eb9cc9700
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/machi_file_proxy.erl
View file

@ -347,7 +347,7 @@ handle_call({append, ClientMeta, Extra, Data}, _From,
{error, {bad_csum, Bad}} -> {error, {bad_csum, Bad}} ->
lager:error("Bad checksum; client sent ~p, we computed ~p", lager:error("Bad checksum; client sent ~p, we computed ~p",
[ClientCsum, Bad]), [ClientCsum, Bad]),
{{error, bad_csum}, Err + 1, U}; {{error, bad_checksum}, Err + 1, U};
TaggedCsum -> TaggedCsum ->
case handle_write(FHd, FHc, F, TaggedCsum, EofP, Data, U) of case handle_write(FHd, FHc, F, TaggedCsum, EofP, Data, U) of
{ok, NewU1} -> {ok, NewU1} ->
@ -495,7 +495,7 @@ check_or_make_tagged_csum(Tag, InCsum, Data) when Tag == ?CSUM_TAG_CLIENT_SHA;
end; end;
check_or_make_tagged_csum(OtherTag, _ClientCsum, _Data) -> check_or_make_tagged_csum(OtherTag, _ClientCsum, _Data) ->
lager:warning("Unknown checksum tag ~p", [OtherTag]), lager:warning("Unknown checksum tag ~p", [OtherTag]),
{error, bad_csum}. {error, bad_checksum}.
encode_csum_file_entry(Offset, Size, TaggedCSum) -> encode_csum_file_entry(Offset, Size, TaggedCSum) ->
Len = 8 + 4 + byte_size(TaggedCSum), Len = 8 + 4 + byte_size(TaggedCSum),
@ -535,7 +535,7 @@ parse_csum_file(Filename) ->
Unwritten :: [byte_sequence()] Unwritten :: [byte_sequence()]
) -> {ok, Bytes :: binary(), Csum :: binary()} | ) -> {ok, Bytes :: binary(), Csum :: binary()} |
eof | eof |
{error, bad_csum} | {error, bad_checksum} |
{error, partial_read} | {error, partial_read} |
{error, not_written} | {error, not_written} |
{error, Other :: term() }. {error, Other :: term() }.
@ -544,7 +544,7 @@ parse_csum_file(Filename) ->
% <ul> If the byte range is not yet written, `{error, not_written}' is % <ul> If the byte range is not yet written, `{error, not_written}' is
% returned.</ul> % returned.</ul>
% <ul> If the checksum given does not match what comes off the disk, % <ul> If the checksum given does not match what comes off the disk,
% `{error, bad_csum}' is returned.</ul> % `{error, bad_checksum}' is returned.</ul>
% <ul> If the number of bytes that comes off the disk is not the requested length, % <ul> If the number of bytes that comes off the disk is not the requested length,
% `{error, partial_read}' is returned.</ul> % `{error, partial_read}' is returned.</ul>
% <ul> If the offset is at or beyond the current file boundary, `eof' is returned.</ul> % <ul> If the offset is at or beyond the current file boundary, `eof' is returned.</ul>
@ -574,7 +574,7 @@ do_read(FHd, Filename, TaggedCsum, Offset, Size) ->
{error, Bad} -> {error, Bad} ->
lager:error("Bad checksum; got ~p, expected ~p", lager:error("Bad checksum; got ~p, expected ~p",
[Bad, Ck]), [Bad, Ck]),
{error, bad_csum}; {error, bad_checksum};
TaggedCsum -> TaggedCsum ->
{ok, Bytes, TaggedCsum}; {ok, Bytes, TaggedCsum};
%% XXX FIXME: Should we return something other than %% XXX FIXME: Should we return something other than