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

cache sync: fetch_missing_csize don't check ids against empty idx 

This is always the case if self.do_cache is False.
This commit is contained in:
Marian Beermann 2017-06-10 19:22:20 +02:00
parent fc7c560345
commit 3c8257432a
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/borg/cache.py
View File

@ -644,14 +644,17 @@ class LocalCache(CacheStatsMixin):
all_missing_ids = chunk_idx.zero_csize_ids()
fetch_ids = []
for id_ in all_missing_ids:
already_fetched_entry = chunks_fetched_size_index.get(id_)
if already_fetched_entry:
entry = chunk_idx[id_]._replace(csize=already_fetched_entry.csize)
assert entry.size == already_fetched_entry.size, 'Chunk size mismatch'
chunk_idx[id_] = entry
else:
fetch_ids.append(id_)
if len(chunks_fetched_size_index):
for id_ in all_missing_ids:
already_fetched_entry = chunks_fetched_size_index.get(id_)
if already_fetched_entry:
entry = chunk_idx[id_]._replace(csize=already_fetched_entry.csize)
assert entry.size == already_fetched_entry.size, 'Chunk size mismatch'
chunk_idx[id_] = entry
else:
fetch_ids.append(id_)
else:
fetch_ids = all_missing_ids
for id_, data in zip(fetch_ids, decrypted_repository.repository.get_many(fetch_ids)):
entry = chunk_idx[id_]._replace(csize=len(data))

3
src/borg/testsuite/archiver.py
View File

@ -1041,6 +1041,9 @@ class ArchiverTestCase(ArchiverTestCaseBase):
create_stats = create_json['cache']['stats']
info_stats = info_json['cache']['stats']
assert create_stats == info_stats
self.cmd('delete', '--cache-only', self.repository_location)
self.cmd('create', '--no-cache-sync', self.repository_location + '::test2', 'input')
self.cmd('info', self.repository_location)
self.cmd('check', self.repository_location)
def test_extract_pattern_opt(self):