Skip to content

Add shard upload, shard download verification, and range verification #381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add shard upload, shard download verification, and range verification #381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions oss2/resumable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,7 @@ def __download_part(self, part):
headers[IF_UNMODIFIED_SINCE] = utils.http_date(self.objectInfo.mtime)

result = self.bucket.get_object(self.key, byte_range=(part.start, part.end - 1), headers=headers, params=self.__params)
utils.verify_object_meta(self, part.start, result)
utils.copyfileobj_and_verify(result, f, part.end - part.start, request_id=result.request_id)

part.part_crc = result.client_crc
Expand Down Expand Up @@ -610,6 +611,7 @@ def __upload_part(self, part):
self._report_progress(self.__finished_size)

f.seek(part.start, os.SEEK_SET)
utils.assert_file_not_change(self)
headers = _populate_valid_headers(self.__headers, [OSS_REQUEST_PAYER, OSS_TRAFFIC_LIMIT])
if self.__encryption:
result = self.bucket.upload_part(self.key, self.__upload_id, part.part_number,
Expand Down
16 changes: 16 additions & 0 deletions oss2/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -894,3 +894,19 @@ def to_str(pos):
return str(pos)

return to_str(start) + '-' + to_str(last)

def verify_object_meta(self, start, result):
if hasattr(result, 'status') and not hasattr(self.bucket, 'crypto_provider') and result.status == 206:
range_start = result.content_range[result.content_range.find('bytes')+6:result.content_range.find('-')]
if range_start and str(start) != range_start:
raise ValueError("Range get fail, expect offset:{0}, return offset:{1}".format(start, result.content_range))
if hasattr(result, 'etag') and self.objectInfo.etag != result.etag:
raise ValueError("Range get fail, expect object etag:{0}, return etag:{1}".format(self.objectInfo.etag, result.etag))


def assert_file_not_change(self):
if hasattr(self, 'mtime'):
if self.mtime != os.path.getmtime(self.filename):
raise ValueError("The last modification time of the file has changed, Last file modification time:{0}, The file modification time:{1}".format(self.__mtime, os.path.getmtime(self.filename)))
else:
self.mtime = os.path.getmtime(self.filename)