mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-01-02 21:25:26 +00:00
Code Issues Releases Wiki Activity

caching a merged chunk index: only delete what we merged

Browse source
This commit is contained in:
Thomas Waldmann 2024-11-08 21:23:43 +01:00
parent 00f8cdc9a7
commit 43a27f294d
No known key found for this signature in database
GPG key ID: 243ACFA951F78E01
1 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/borg/cache.py
View file

@ -707,7 +707,9 @@ def delete_chunkindex_cache(repository):
CHUNKINDEX_HASH_SEED = 2 CHUNKINDEX_HASH_SEED = 2
def write_chunkindex_to_repo_cache(repository, chunks, *, clear=False, force_write=False, delete_other=False): def write_chunkindex_to_repo_cache(
repository, chunks, *, clear=False, force_write=False, delete_other=False, delete_these=None
):
cached_hashes = list_chunkindex_hashes(repository) cached_hashes = list_chunkindex_hashes(repository)
with io.BytesIO() as f: with io.BytesIO() as f:
chunks.write(f) chunks.write(f)
@ -728,14 +730,20 @@ def write_chunkindex_to_repo_cache(repository, chunks, *, clear=False, force_wri
logger.debug(f"caching chunks index as {cache_name} in repository...") logger.debug(f"caching chunks index as {cache_name} in repository...")
repository.store_store(cache_name, data) repository.store_store(cache_name, data)
if delete_other: if delete_other:
for hash in cached_hashes: delete_these = cached_hashes
elif delete_these:
pass
else:
delete_these = []
for hash in delete_these:
cache_name = f"cache/chunks.{hash}" cache_name = f"cache/chunks.{hash}"
try: try:
repository.store_delete(cache_name) repository.store_delete(cache_name)
except (Repository.ObjectNotFound, StoreObjectNotFound): except (Repository.ObjectNotFound, StoreObjectNotFound):
# TODO: ^ seem like RemoteRepository raises Repository.ONF instead of StoreONF # TODO: ^ seem like RemoteRepository raises Repository.ONF instead of StoreONF
pass pass
logger.debug(f"cached chunk indexes deleted: {cached_hashes}") if delete_these:
logger.debug(f"cached chunk indexes deleted: {delete_these}")
return new_hash return new_hash
@ -776,7 +784,9 @@ def build_chunkindex_from_repo(repository, *, disable_caches=False, cache_immedi
if merged > 0: if merged > 0:
if merged > 1 and cache_immediately: if merged > 1 and cache_immediately:
# immediately update cache/chunks, so we don't have to merge these again: # immediately update cache/chunks, so we don't have to merge these again:
write_chunkindex_to_repo_cache(repository, chunks, clear=False, force_write=True, delete_other=True) write_chunkindex_to_repo_cache(
repository, chunks, clear=False, force_write=True, delete_these=hashes
)
return chunks return chunks
# if we didn't get anything from the cache, compute the ChunkIndex the slow way: # if we didn't get anything from the cache, compute the ChunkIndex the slow way:
logger.debug("querying the chunk IDs list from the repo...") logger.debug("querying the chunk IDs list from the repo...")
@ -875,7 +885,7 @@ def add_chunk(
def _write_chunks_cache(self, chunks): def _write_chunks_cache(self, chunks):
# this is called from .close, so we can clear here: # this is called from .close, so we can clear here:
write_chunkindex_to_repo_cache(self.repository, self._chunks, clear=True, delete_other=False) write_chunkindex_to_repo_cache(self.repository, self._chunks, clear=True)
self._chunks = None # nothing there (cleared!) self._chunks = None # nothing there (cleared!)
def refresh_lock(self, now): def refresh_lock(self, now):