mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-03-04 18:48:43 +00:00
Code Issues Releases Wiki Activity

borg debug dump-repo-objs: new --segment=S --offset=O options

Browse source 
the new options limit processing to segment S (and, optionally, also
to offset O), so you do not need to dump your complete repo to only
look at 1 segment (or 1 object).

note: there is no rpc api for scan_low_level, so this only works locally.
This commit is contained in:
Thomas Waldmann 2022-05-27 23:29:45 +02:00
parent 1b231e79e2
commit 49f191bc4c
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/borg/archiver.py
View file

@ -2044,7 +2044,7 @@ class Archiver:
key = key_factory(repository, cdata) key = key_factory(repository, cdata)
break break
i = 0 i = 0
for id, cdata, tag, segment, offset in repository.scan_low_level(): for id, cdata, tag, segment, offset in repository.scan_low_level(segment=args.segment, offset=args.offset):
if tag == TAG_PUT: if tag == TAG_PUT:
decrypt_dump(i, id, cdata, tag='put', segment=segment, offset=offset) decrypt_dump(i, id, cdata, tag='put', segment=segment, offset=offset)
elif tag == TAG_DELETE: elif tag == TAG_DELETE:
@ -3657,6 +3657,10 @@ class Archiver:
help='repository to dump') help='repository to dump')
subparser.add_argument('--ghost', dest='ghost', action='store_true', subparser.add_argument('--ghost', dest='ghost', action='store_true',
help='dump all segment file contents, including deleted/uncommitted objects and commits.') help='dump all segment file contents, including deleted/uncommitted objects and commits.')
subparser.add_argument('--segment', metavar='SEG', dest='segment', default=None, type=positive_int_validator,
help='used together with --ghost: limit processing to given segment.')
subparser.add_argument('--offset', metavar='OFFS', dest='offset', default=None, type=positive_int_validator,
help='used together with --ghost: limit processing to given offset.')
debug_search_repo_objs_epilog = process_epilog(""" debug_search_repo_objs_epilog = process_epilog("""
This command searches raw (but decrypted and decompressed) repo objects for a specific bytes sequence. This command searches raw (but decrypted and decompressed) repo objects for a specific bytes sequence.

18
src/borg/repository.py
View file

@ -1091,7 +1091,7 @@ class Repository:
logger.info('Finished %s repository check, no problems found.', mode) logger.info('Finished %s repository check, no problems found.', mode)
return not error_found or repair return not error_found or repair
def scan_low_level(self): def scan_low_level(self, segment=None, offset=None):
"""Very low level scan over all segment file entries. """Very low level scan over all segment file entries.
It does NOT care about what's committed and what not. It does NOT care about what's committed and what not.
@ -1100,13 +1100,21 @@ class Repository:
This is intended as a last-resort way to get access to all repo contents of damaged repos, This is intended as a last-resort way to get access to all repo contents of damaged repos,
when there is uncommitted, but valuable data in there... when there is uncommitted, but valuable data in there...
When segment or segment+offset is given, limit processing to this location only.
""" """
for segment, filename in self.io.segment_iterator(): for current_segment, filename in self.io.segment_iterator(segment=segment):
if segment is not None and current_segment > segment:
break
try: try:
for tag, key, offset, data in self.io.iter_objects(segment, include_data=True): for tag, key, current_offset, data in self.io.iter_objects(segment=current_segment,
yield key, data, tag, segment, offset offset=offset or 0, include_data=True):
if offset is not None and current_offset > offset:
break
yield key, data, tag, current_segment, current_offset
except IntegrityError as err: except IntegrityError as err:
logger.error('Segment %d (%s) has IntegrityError(s) [%s] - skipping.' % (segment, filename, str(err))) logger.error('Segment %d (%s) has IntegrityError(s) [%s] - skipping.' % (
current_segment, filename, str(err)))
def _rollback(self, *, cleanup): def _rollback(self, *, cleanup):
""" """