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

Reduce prune memory usage #4354

Merged
merged 6 commits into from May 24, 2024
Merged

Conversation

MichaelEischer
Copy link
Member

@MichaelEischer MichaelEischer commented Jun 2, 2023

What does this PR change? What problem does it solve?

The main memory usage of prune (besides the repository index) is a huge CountedBlobSet. The blob ids stored in this set are already stored in the repository index. This PR contains a proof of concept for a data structure that no longer duplicates these ids, but rather reuses them.

This PR fundamentally depends on #4352, which stores all indexEntries in a large array. Thus an indexEntry and its contained blob id becomes identifiable by its array index. As an indexMap can only add but not remove entries, this array index is guaranteed to be stable. Thus the AssociatedData structure in the PR can allocate an array that only consists of the values that were stored in a CountedBlobSet and use the array index to look up the matching blob id in the indexMap.

Using this PR, prune requires up to 50% less memory while determining which blobs to keep.

Was the change previously discussed in an issue or on the forum?

Alternative to the minimal perfect hashes discussed in #3328

Checklist

  • I have read the contribution guidelines.
  • I have enabled maintainer edits.
  • I have added tests for all code changes.
  • [ ] I have added documentation for relevant changes (in the manual).
  • There's a new file in changelog/unreleased/ that describes the changes for our users (see template).
  • I have run gofmt on the code in all commits.
  • All commit messages are formatted in the same style as the other commits in the repo.
  • I'm done! This pull request is ready for review.

@MichaelEischer MichaelEischer force-pushed the associated-data branch 2 times, most recently from 36ef4d2 to 9ce9717 Compare June 17, 2023 15:57
@MichaelEischer MichaelEischer marked this pull request as draft October 27, 2023 18:02
@MichaelEischer MichaelEischer force-pushed the associated-data branch 2 times, most recently from 95d2381 to 017e69b Compare May 20, 2024 12:52
@MichaelEischer MichaelEischer changed the title WIP: Reduce prune memory usage Reduce prune memory usage May 20, 2024
@MichaelEischer MichaelEischer marked this pull request as ready for review May 20, 2024 13:29
@MichaelEischer
Copy link
Member Author

MichaelEischer commented May 20, 2024

Compared to restic 0.16.4, this PR + #4812 drastically reduce the prune memory usage (using numbers from gcvis, which are slightly lower than those shown by htop, but still appear to be reasonable):

Before (restic 0.16.4):
Bildschirmfoto vom 2024-05-20 15-19-39-2

After (this PR + #4812):
Bildschirmfoto vom 2024-05-20 15-03-35-2

(The repository has 400GB with 8 million blobs. The repack phase differs as the previous prune run already removed a bit of data)

This PR optimizes the "search used blobs"-phase, whereas #4812 optimizes the "rebuild index"-phase.

Copy link
Member Author

@MichaelEischer MichaelEischer left a comment

Choose a reason for hiding this comment

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

LGTM.

@MichaelEischer MichaelEischer merged commit 55cb8d1 into restic:master May 24, 2024
13 checks passed
@MichaelEischer MichaelEischer deleted the associated-data branch May 24, 2024 20:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

None yet

1 participant