mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-01-03 05:35:58 +00:00
Code Issues Releases Wiki Activity

change xxh64 seed for ChunkIndex to invalidate old cache contents

Browse source 
borg2 < beta 12 used the old hashindex code to serialize the ChunkIndex.

beta 12 uses borghash now and the serialization format is different.
This commit is contained in:
Thomas Waldmann 2024-10-31 17:47:22 +01:00
parent 601fc48388
commit c37c78f6be
No known key found for this signature in database
GPG key ID: 243ACFA951F78E01
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/borg/cache.py
View file

@ -630,6 +630,9 @@ def load_chunks_hash(repository) -> bytes:
return hash
CHUNKINDEX_HASH_SEED = 1
def write_chunkindex_to_repo_cache(repository, chunks, *, clear=False, force_write=False):
cached_hash = load_chunks_hash(repository)
with io.BytesIO() as f:
@ -638,7 +641,7 @@ def write_chunkindex_to_repo_cache(repository, chunks, *, clear=False, force_wri
if clear:
# if we don't need the in-memory chunks index anymore:
chunks.clear() # free memory, immediately
new_hash = xxh64(data)
new_hash = xxh64(data, seed=CHUNKINDEX_HASH_SEED)
if force_write or new_hash != cached_hash:
# when an updated chunks index is stored into the cache, we also store its hash into the cache.
# when a client is loading the chunks index from a cache, it has to compare its xxh64
@ -666,7 +669,7 @@ def build_chunkindex_from_repo(repository, *, disable_caches=False, cache_immedi
# TODO: ^ seem like RemoteRepository raises Repository.ONF instead of StoreONF
logger.debug("cache/chunks not found in the repository.")
else:
if xxh64(chunks_data) == wanted_hash:
if xxh64(chunks_data, seed=CHUNKINDEX_HASH_SEED) == wanted_hash:
logger.debug("cache/chunks is valid.")
with io.BytesIO(chunks_data) as f:
chunks = ChunkIndex.read(f)