vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1051 from jakedt/blobcompensation

Browse source 
Fix the overlap condition on resumed uploads
This commit is contained in:
Jake Moshenko 2015-12-10 13:55:45 -05:00
commit dbdad16169
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
endpoints/v2/blob.py
View file

@ -204,8 +204,17 @@ def _upload_chunk(namespace, repo_name, upload_uuid):
if start_offset > 0 and start_offset < found.byte_count: if start_offset > 0 and start_offset < found.byte_count:
# Skip the bytes which were received on a previous push, which are already stored and # Skip the bytes which were received on a previous push, which are already stored and
# included in the sha calculation # included in the sha calculation
input_fp = StreamSlice(input_fp, found.byte_count - start_offset) overlap_size = found.byte_count - start_offset
input_fp = StreamSlice(input_fp, overlap_size)
# Update our upload bounds to reflect the skipped portion of the overlap
start_offset = found.byte_count start_offset = found.byte_count
length = max(length - overlap_size, 0)
# We use this to escape early in case we have already processed all of the bytes the user
# wants to upload
if length == 0:
return found
input_fp = wrap_with_handler(input_fp, found.sha_state.update) input_fp = wrap_with_handler(input_fp, found.sha_state.update)