cp: close file descriptors after cow on linux #2330
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
Instead of using into_raw_fd(), which transfers ownership and requires us to close the file descriptor manually, use as_raw_fd(), which does not transfer ownership to us but drops the file descriptor when the original file is dropped (in our case at the end of the function).
|
Return current file descriptor limit: |
|
I have also found |
|
I think I have figured out a working solution (using rlimits), please check if it looks right... |
miDeb
force-pushed
the
cp/close-fd
branch
4 times, most recently
from
709b76f to
8621b17
Compare
I don't know rust well enough to review that but I can say that it fixed the problem in NixOS when building ed with uutils-coreutils as gnu-coreutils replacement. |
sylvestre
reviewed
Jun 3, 2021
| @@ -724,6 +729,8 @@ pub struct UCommand { | |||
| stdout: Option<Stdio>, | |||
| stderr: Option<Stdio>, | |||
| bytes_into_stdin: Option<Vec<u8>>, | |||
| #[cfg(target_os = "linux")] | |||
| limits: Vec<(rlimit::Resource, rlim, rlim)>, | |||
There was a problem hiding this comment.
smart (adding it as part of the test framework)
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.
Instead of using into_raw_fd(), which transfers ownership and
requires us to close the file descriptor manually,
use as_raw_fd(), which does not transfer ownership to us but drops the
file descriptor when the original file is dropped (in our case at the
end of the function).
Closes #2312.
I tried to come up with a test for this, but I couldn't find a way to query the amount of file descriptors used, or to limit the number of open files for a test. If somebody could come up with a way to test this, that'd be awesome.