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

Log stream_write_to_fp ioerrors

Browse source
This commit is contained in:
Silas Sewell 2015-12-07 15:40:18 -05:00
parent 0876fc754a
commit 76fd744453
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
storage/basestorage.py
View file

@ -1,8 +1,11 @@
import logging
import tempfile import tempfile
from digest.digest_tools import content_path from digest.digest_tools import content_path
from util.registry.filelike import READ_UNTIL_END from util.registry.filelike import READ_UNTIL_END
logger = logging.getLogger(__name__)
class StoragePaths(object): class StoragePaths(object):
shared_images = 'sharedimages' shared_images = 'sharedimages'
@ -104,6 +107,7 @@ class BaseStorage(StoragePaths):
out_fp.write(buf) out_fp.write(buf)
bytes_copied += len(buf) bytes_copied += len(buf)
except IOError: except IOError:
logger.error('Failed to stream_write_to_fp: %s', err)
break break
return bytes_copied return bytes_copied

8
storage/cloud.py
View file

@ -175,6 +175,8 @@ class _CloudStorage(BaseStorageV2):
# We are going to reuse this but be VERY careful to only read the number of bytes written to it # We are going to reuse this but be VERY careful to only read the number of bytes written to it
buf = StringIO.StringIO() buf = StringIO.StringIO()
chunk_sizes = []
num_part = 1 num_part = 1
total_bytes_written = 0 total_bytes_written = 0
while size == filelike.READ_UNTIL_END or total_bytes_written < size: while size == filelike.READ_UNTIL_END or total_bytes_written < size:
@ -190,6 +192,8 @@ class _CloudStorage(BaseStorageV2):
if bytes_staged == 0: if bytes_staged == 0:
break break
chunk_sizes.append(bytes_staged)
buf.seek(0) buf.seek(0)
mp.upload_part_from_file(buf, num_part, size=bytes_staged) mp.upload_part_from_file(buf, num_part, size=bytes_staged)
total_bytes_written += bytes_staged total_bytes_written += bytes_staged
@ -202,7 +206,11 @@ class _CloudStorage(BaseStorageV2):
if total_bytes_written > 0: if total_bytes_written > 0:
app.metric_queue.put('MultipartUploadSuccess', 1) app.metric_queue.put('MultipartUploadSuccess', 1)
try:
mp.complete_upload() mp.complete_upload()
except:
logger.error('complete_upload failed: chunk_sizes: %s', chunk_sizes)
raise
return total_bytes_written return total_bytes_written
def list_directory(self, path=None): def list_directory(self, path=None):