Remove inodes from their parent in forget
#380
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The parent directory still holds onto an `Inode` (an `Arc<InodeInner>`), so right now our `forget` is leaking the actual inode. We need to remove it from its parent at `forget` time. Also updated the tests to check that the inode is in fact free'd. I tested this by listing a directory with 2M objects on an instance with 1GiB of memory, and saw constant memory usage. Signed-off-by: James Bornholt <bornholt@amazon.com>
jamesbornholt
temporarily deployed
to
PR integration tests
GitHub Actions
Inactive
jamesbornholt
temporarily deployed
to
PR integration tests
GitHub Actions
Inactive
jamesbornholt
temporarily deployed
to
PR integration tests
GitHub Actions
Inactive
jamesbornholt
temporarily deployed
to
PR integration tests
GitHub Actions
Inactive
passaro
requested changes
Jul 17, 2023
mountpoint-s3/src/inode.rs
Outdated
| let InodeKindData::Directory { children, writing_children, .. } = &mut parent_state.kind_data else { | ||
| unreachable!("parent is always a directory"); | ||
| }; | ||
| children.remove(inode.name()); |
There was a problem hiding this comment.
Should we check that we are in fact removing the same inode? vs a new child with the same name?
There was a problem hiding this comment.
It should be possible to write a test for this scenario, e.g.:
- unlink child
- mknod new child with same name
- forget original child
There was a problem hiding this comment.
Nice catch. I wrote a slightly different test with the same idea -- the child changes from a file to a directory and so gets recreated, forgetting the original child.
Signed-off-by: James Bornholt <bornholt@amazon.com>
jamesbornholt
temporarily deployed
to
PR integration tests
GitHub Actions
Inactive
jamesbornholt
temporarily deployed
to
PR integration tests
GitHub Actions
Inactive
jamesbornholt
temporarily deployed
to
PR integration tests
GitHub Actions
Inactive
jamesbornholt
temporarily deployed
to
PR integration tests
GitHub Actions
Inactive
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of change
The parent directory still holds onto an
Inode(anArc<InodeInner>), so right now ourforgetis leaking the actual inode. We need to remove it from its parent atforgettime. Also updated the tests to check that the inode is in fact free'd.I tested this by listing a directory with 2M objects on an instance with 1GiB of memory, and saw constant memory usage.
Does this change impact existing behavior?
No.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and I agree to the terms of the Developer Certificate of Origin (DCO).