openstack/python-swiftclient
Code Issues Proposed changes

Adding segment size as another x-object-manifest component

Browse Source 
Fix bug 1082930

Change-Id: I2cee91a8f74a3f58379b1b4aefae9401ba5b02c1
This commit is contained in:
yuan-zhou 2012-11-27 15:33:50 +08:00
parent 0053b4cf0e
commit 94511a0624
1 changed files with 5 additions and 4 deletions

9
bin/swift

@ -861,9 +861,9 @@ def st_upload(parser, args, print_queue, error_queue):
if segment_start + segment_size > full_size: if segment_start + segment_size > full_size:
segment_size = full_size - segment_start segment_size = full_size - segment_start
segment_queue.put({'path': path, segment_queue.put({'path': path,
'obj': '%s/%s/%s/%08d' % (obj, 'obj': '%s/%s/%s/%s/%08d' % (obj,
put_headers['x-object-meta-mtime'], full_size, put_headers['x-object-meta-mtime'], full_size,
segment), options.segment_size, segment),
'segment_start': segment_start, 'segment_start': segment_start,
'segment_size': segment_size, 'segment_size': segment_size,
'log_line': '%s segment %s' % (obj, segment)}) 'log_line': '%s segment %s' % (obj, segment)})
@ -879,9 +879,10 @@ def st_upload(parser, args, print_queue, error_queue):
raise ClientException('Aborting manifest creation ' raise ClientException('Aborting manifest creation '
'because not all segments could be uploaded. %s/%s' 'because not all segments could be uploaded. %s/%s'
% (container, obj)) % (container, obj))
new_object_manifest = '%s_segments/%s/%s/%s/' % ( new_object_manifest = '%s_segments/%s/%s/%s/%s' % (
quote(container), quote(obj), quote(container), quote(obj),
put_headers['x-object-meta-mtime'], full_size) put_headers['x-object-meta-mtime'], full_size,
options.segment_size)
if old_manifest == new_object_manifest: if old_manifest == new_object_manifest:
old_manifest = None old_manifest = None
put_headers['x-object-manifest'] = new_object_manifest put_headers['x-object-manifest'] = new_object_manifest