diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-12-03 19:41:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-12-03 19:41:46 +0000 |
| commit | 4efe3bfa7e7fc1af4ab5d64c934076bf2fa4a80c (patch) | |
| tree | 8eb5b3c5f19f76f8550471819a663e944602fd5e | |
| parent | 402d87c75781bc56fb915e3bb0ed40f71c0364f2 (diff) | |
| parent | 94511a06242d336277a00232c0997436225082c7 (diff) | |
| download | python-swiftclient-4efe3bfa7e7fc1af4ab5d64c934076bf2fa4a80c.tar.gz | |
Merge "Adding segment size as another x-object-manifest component"
| -rwxr-xr-x | bin/swift | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -861,9 +861,9 @@ def st_upload(parser, args, print_queue, error_queue): if segment_start + segment_size > full_size: segment_size = full_size - segment_start 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, - segment), + options.segment_size, segment), 'segment_start': segment_start, 'segment_size': segment_size, '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 ' 'because not all segments could be uploaded. %s/%s' % (container, obj)) - new_object_manifest = '%s_segments/%s/%s/%s/' % ( + new_object_manifest = '%s_segments/%s/%s/%s/%s' % ( 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: old_manifest = None put_headers['x-object-manifest'] = new_object_manifest |