Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cache sync stuff #1940

Merged
merged 2 commits into from
Dec 9, 2016
Merged

Cache sync stuff #1940

merged 2 commits into from
Dec 9, 2016

Conversation

enkore
Copy link
Contributor

@enkore enkore commented Dec 9, 2016

No description provided.

@codecov-io
Copy link

codecov-io commented Dec 9, 2016

Current coverage is 82.26% (diff: 55.55%)

Merging #1940 into master will decrease coverage by 0.05%

@@             master      #1940   diff @@
==========================================
  Files            20         20          
  Lines          6764       6765     +1   
  Methods           0          0          
  Messages          0          0          
  Branches       1165       1165          
==========================================
- Hits           5568       5565     -3   
- Misses          886        889     +3   
- Partials        310        311     +1   

Powered by Codecov. Last update 7e5ed40...be18418

for chunk_id, size, csize in item.chunks:
chunk_idx.add(chunk_id, 1, size, csize)
for chunk_id, size, csize in item.get(b'chunks', []):
chunk_idx.add(chunk_id, 1, size, csize)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does that make a big difference, did you measure it?

Copy link
Contributor Author

@enkore enkore Dec 9, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are both a bit older, this change was looked at previously in #1729 / #235 (comment) . The difference is probably a bit smaller since item now runs w/o the interpreter (well, parts of it...), but I don't expect much (it'd still do the allocations)

chunk_idx.merge(archive_chunk_idx)
chunk_idx = chunk_idx or ChunkIndex()
logger.info('Fetching archive index for %s ...' % archive_name)
fetch_and_build_idx(archive_id, repository, self.key, chunk_idx)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, nice, that saves the merging.

@enkore enkore merged commit 9d31538 into borgbackup:master Dec 9, 2016
@enkore enkore deleted the f/cache-sync branch December 9, 2016 20:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants