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

Make sure we send the extra zeros in chunks

Browse source
This commit is contained in:
Joseph Schorr 2014-10-14 15:58:52 -04:00
parent 3b88ba7373
commit efb3c6c494
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
util/dockerloadformat.py
View file

@ -1,4 +1,4 @@
from util.gzipwrap import GzipWrap from util.gzipwrap import GzipWrap, GZIP_BUFFER_SIZE
from util.streamlayerformat import StreamLayerMerger from util.streamlayerformat import StreamLayerMerger
from app import app from app import app
@ -75,7 +75,11 @@ def _import_format_generator(namespace, repository, tag, synthetic_image_id,
# If the yielded size is less than the estimated size (which is likely), fill the rest with # If the yielded size is less than the estimated size (which is likely), fill the rest with
# zeros. # zeros.
if yielded_size < estimated_file_size: if yielded_size < estimated_file_size:
yield '\0' * (estimated_file_size - yielded_size) to_yield = estimated_file_size - yielded_size
while to_yield > 0:
yielded = min(to_yield, GZIP_BUFFER_SIZE)
yield '\0' * yielded
to_yield -= yielded
# Yield any file padding to 512 bytes that is necessary. # Yield any file padding to 512 bytes that is necessary.
yield _tar_file_padding(estimated_file_size) yield _tar_file_padding(estimated_file_size)

5
util/gzipwrap.py
View file

@ -1,5 +1,8 @@
from gzip import GzipFile from gzip import GzipFile
# 256K buffer to Gzip
GZIP_BUFFER_SIZE = 1024 * 256
class GzipWrap(object): class GzipWrap(object):
def __init__(self, input, filename=None, compresslevel=1): def __init__(self, input, filename=None, compresslevel=1):
self.input = iter(input) self.input = iter(input)
@ -21,7 +24,7 @@ class GzipWrap(object):
input_size = 0 input_size = 0
input_buffer = '' input_buffer = ''
while input_size < 1024 * 256: # 256K buffer to Gzip while input_size < GZIP_BUFFER_SIZE:
try: try:
s = self.input.next() s = self.input.next()
input_buffer += s input_buffer += s