mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-23 00:07:38 +00:00
Code Issues Releases Wiki Activity

Validate tag ID when --repair[ing] an object

Browse source 
This too should make the scan faster as, assuming the data is
random, we can skip CRC checks for almost 94% of the incorrect
header location solely based on the tag.

As draw back, this will limit the number of tags that can be
added without breaking backwards compatibility to 16, with
13 currently unused.
This commit is contained in:
Peter Gerber 2021-10-25 19:24:44 +00:00
parent 2bc91e5010
commit 6c21404143
No known key found for this signature in database
GPG key ID: A9BC0494BD1AE92E
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/borg/repository.py
View file

@ -38,6 +38,15 @@
TAG_DELETE = 1 TAG_DELETE = 1
TAG_COMMIT = 2 TAG_COMMIT = 2
# Highest ID usable as TAG_* value
#
# Code may expect not to find any tags exceeding this value. In particular,
# in order to speed up `borg check --repair`, any tag greater than MAX_TAG_ID
# is assumed to be corrupted. When increasing this value, in order to add more
# tags, keep in mind that old versions of Borg accessing a new repository
# may not be able to handle the new tags.
MAX_TAG_ID = 15
FreeSpace = partial(defaultdict, int) FreeSpace = partial(defaultdict, int)
@ -1518,8 +1527,8 @@ def recover_segment(self, segment, filename):
dst_fd.write(MAGIC) dst_fd.write(MAGIC)
while len(d) >= self.header_fmt.size: while len(d) >= self.header_fmt.size:
crc, size, tag = self.header_fmt.unpack(d[:self.header_fmt.size]) crc, size, tag = self.header_fmt.unpack(d[:self.header_fmt.size])
if size > MAX_OBJECT_SIZE or size < self.header_fmt.size or size > len(d) if size > MAX_OBJECT_SIZE or tag > MAX_TAG_ID or size < self.header_fmt.size \
or crc32(d[4:size]) & 0xffffffff != crc: or size > len(d) or crc32(d[4:size]) & 0xffffffff != crc:
d = d[1:] d = d[1:]
continue continue
dst_fd.write(d[:size]) dst_fd.write(d[:size])
@ -1548,6 +1557,10 @@ def read(self, segment, offset, id, read_data=True):
def _read(self, fd, fmt, header, segment, offset, acceptable_tags, read_data=True): def _read(self, fd, fmt, header, segment, offset, acceptable_tags, read_data=True):
# some code shared by read() and iter_objects() # some code shared by read() and iter_objects()
# See comment on MAX_TAG_ID for details
assert max(acceptable_tags) <= MAX_TAG_ID, 'Exceeding MAX_TAG_ID will break backwards compatibility'
try: try:
hdr_tuple = fmt.unpack(header) hdr_tuple = fmt.unpack(header)
except struct.error as err: except struct.error as err: