mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-27 02:08:54 +00:00
Code Issues Releases Wiki Activity

cache: integrity checking in archive.chunks.d

Browse source
This commit is contained in:
Marian Beermann 2017-05-25 13:49:03 +02:00
parent 2b518b7188
commit 1dfe693003
2 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/borg/cache.py
View file

@ -527,7 +527,7 @@ def sync(self):
def mkpath(id, suffix=''):
id_hex = bin_to_hex(id)
path = os.path.join(archive_path, id_hex + suffix)
return path.encode('utf-8')
return path
def cached_archives():
if self.do_cache:
@ -543,6 +543,10 @@ def repo_archives():
def cleanup_outdated(ids):
for id in ids:
os.unlink(mkpath(id))
try:
os.unlink(mkpath(id) + '.integrity')
except FileNotFoundError:
pass
def fetch_and_build_idx(archive_id, repository, key, chunk_idx):
cdata = repository.get(archive_id)
@ -565,12 +569,13 @@ def fetch_and_build_idx(archive_id, repository, key, chunk_idx):
if self.do_cache:
fn = mkpath(archive_id)
fn_tmp = mkpath(archive_id, suffix='.tmp')
try:
chunk_idx.write(fn_tmp)
except Exception:
os.unlink(fn_tmp)
else:
os.rename(fn_tmp, fn)
with DetachedIntegrityCheckedFile(path=fn_tmp, write=True, filename=bin_to_hex(archive_id)) as fd:
try:
chunk_idx.write(fd)
except Exception:
os.unlink(fn_tmp)
else:
os.rename(fn_tmp, fn)
def lookup_name(archive_id):
for info in self.manifest.archives.list():
@ -601,7 +606,8 @@ def create_master_idx(chunk_idx):
if archive_id in cached_ids:
archive_chunk_idx_path = mkpath(archive_id)
logger.info("Reading cached archive chunk index for %s ..." % archive_name)
archive_chunk_idx = ChunkIndex.read(archive_chunk_idx_path)
with DetachedIntegrityCheckedFile(path=archive_chunk_idx_path, write=False) as fd:
archive_chunk_idx = ChunkIndex.read(fd)
else:
logger.info('Fetching and building archive index for %s ...' % archive_name)
archive_chunk_idx = ChunkIndex()

5
src/borg/crypto/file_integrity.py
View file

@ -182,6 +182,9 @@ def store_integrity_data(self, data: str):
class DetachedIntegrityCheckedFile(IntegrityCheckedFile):
def __init__(self, path, write, filename=None, override_fd=None):
super().__init__(path, write, filename, override_fd)
filename = filename or os.path.basename(path)
output_dir = os.path.dirname(path)
self.output_integrity_file = self.integrity_file_path(os.path.join(output_dir, filename))
if not write:
self.digests = self.read_integrity_file(self.path, self.hasher)
@ -201,5 +204,5 @@ def read_integrity_file(cls, path, hasher):
raise FileIntegrityError(path)
def store_integrity_data(self, data: str):
with open(self.integrity_file_path(self.path), 'w') as fd:
with open(self.output_integrity_file, 'w') as fd:
fd.write(data)