mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #72 from ThomasWaldmann/loggedio-exceptions 

Loggedio exceptions
This commit is contained in:
TW 2015-06-27 22:17:02 +02:00
parent 3303619b5f 08688fbc13
commit 562f3c7c33
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
borg/repository.py
View File

@ -282,8 +282,8 @@ class Repository:
continue continue
try: try:
objects = list(self.io.iter_objects(segment)) objects = list(self.io.iter_objects(segment))
except (IntegrityError, struct.error): except IntegrityError as err:
report_error('Error reading segment {}'.format(segment)) report_error('Error reading segment {}: {}'.format(segment, err))
objects = [] objects = []
if repair: if repair:
self.io.recover_segment(segment, filename) self.io.recover_segment(segment, filename)
@ -506,18 +506,25 @@ class LoggedIO:
fd = self.get_fd(segment) fd = self.get_fd(segment)
fd.seek(0) fd.seek(0)
if fd.read(MAGIC_LEN) != MAGIC: if fd.read(MAGIC_LEN) != MAGIC:
raise IntegrityError('Invalid segment header') raise IntegrityError('Invalid segment magic')
offset = MAGIC_LEN offset = MAGIC_LEN
header = fd.read(self.header_fmt.size) header = fd.read(self.header_fmt.size)
while header: while header:
crc, size, tag = self.header_fmt.unpack(header) try:
crc, size, tag = self.header_fmt.unpack(header)
except struct.error as err:
raise IntegrityError('Invalid segment entry header [offset {}]: {}'.format(offset, err))
if size > MAX_OBJECT_SIZE: if size > MAX_OBJECT_SIZE:
raise IntegrityError('Invalid segment object size') raise IntegrityError('Invalid segment entry size [offset {}]'.format(offset))
rest = fd.read(size - self.header_fmt.size) length = size - self.header_fmt.size
rest = fd.read(length)
if len(rest) != length:
raise IntegrityError('Segment entry data short read [offset {}]: expected: {}, got {} bytes'.format(
offset, length, len(rest)))
if crc32(rest, crc32(memoryview(header)[4:])) & 0xffffffff != crc: if crc32(rest, crc32(memoryview(header)[4:])) & 0xffffffff != crc:
raise IntegrityError('Segment checksum mismatch') raise IntegrityError('Segment entry checksum mismatch [offset {}]'.format(offset))
if tag not in (TAG_PUT, TAG_DELETE, TAG_COMMIT): if tag not in (TAG_PUT, TAG_DELETE, TAG_COMMIT):
raise IntegrityError('Invalid segment entry header') raise IntegrityError('Invalid segment entry tag [offset {}]'.format(offset))
key = None key = None
if tag in (TAG_PUT, TAG_DELETE): if tag in (TAG_PUT, TAG_DELETE):
key = rest[:32] key = rest[:32]