mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-02-22 14:11:27 +00:00
Code Issues Releases Wiki Activity

extract: refactor hardlinks related code

Browse source 
prepare for a extract_helper context manager

(some changes may seem superfluous, but see the following changesets)
This commit is contained in:
Thomas Waldmann 2017-04-02 01:19:46 +02:00
parent 32c6e3ad95
commit 3cc1cdd2ed
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/borg/archive.py
View file

@ -566,24 +566,25 @@ def make_parent(path):
if stat.S_ISREG(mode):
with backup_io('makedirs'):
make_parent(path)
hardlink_set = False
# Hard link?
if 'source' in item:
source = os.path.join(dest, *item.source.split(os.sep)[stripped_components:])
with backup_io('link'):
if item.source not in hardlink_masters:
os.link(source, path)
return
item.chunks, link_target = hardlink_masters[item.source]
chunks, link_target = hardlink_masters.get(item.source, (None, source))
if link_target:
# Hard link was extracted previously, just link
with backup_io:
with backup_io('link'):
os.link(link_target, path)
return
# Extract chunks, since the item which had the chunks was not extracted
with backup_io('open'):
fd = open(path, 'wb')
hardlink_set = True
elif chunks is not None:
# assign chunks to this item, since the item which had the chunks was not extracted
item.chunks = chunks
if hardlink_set:
return
if sparse and self.zeros is None:
self.zeros = b'\0' * (1 << self.chunker_params[1])
with backup_io('open'):
fd = open(path, 'wb')
with fd:
ids = [c.id for c in item.chunks]
for data in self.pipeline.fetch_many(ids, is_preloaded=True):
@ -595,7 +596,7 @@ def make_parent(path):
fd.seek(len(data), 1)
else:
fd.write(data)
with backup_io('truncate'):
with backup_io('truncate_and_attrs'):
pos = item_chunks_size = fd.tell()
fd.truncate(pos)
fd.flush()
@ -608,7 +609,7 @@ def make_parent(path):
if has_damaged_chunks:
logger.warning('File %s has damaged (all-zero) chunks. Try running borg check --repair.' %
remove_surrogates(item.path))
if hardlink_masters:
if not hardlink_set and hardlink_masters: # 2nd term, is it correct/needed?
# Update master entry with extracted file path, so that following hardlinks don't extract twice.
hardlink_masters[item.get('source') or original_path] = (None, path)
return