fix(sendfile): reuse fd before fallback #8234
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
Alizter
reviewed
Jul 19, 2023
otherlibs/stdune/src/io.ml
Outdated
| @@ -179,6 +179,7 @@ module Copyfile = struct | |||
| let sendfile_with_fallback ?chmod ~src ~dst () = | |||
| try sendfile ?chmod ~src ~dst () | |||
| with Unix.Unix_error (EINVAL, "sendfile", _) -> | |||
| Unix.unlink dst; | |||
There was a problem hiding this comment.
Is this the correct place to do this, or can it be done inside sendfile when it aborts?
There was a problem hiding this comment.
I think there is some similar cleanup for src there too.
There was a problem hiding this comment.
I thought as well, but this happens in the prepare phase, not when sendfile itself fails.
rgrinberg
reviewed
Jul 23, 2023
rgrinberg
approved these changes
Jul 24, 2023
Alizter
approved these changes
Jul 24, 2023
Fixes ocaml#8210 If the `sendfile` branch failed, it leaves an empty target file, so retrying will fail. Instead we reuse the fd directly. Signed-off-by: Etienne Millon <me@emillon.org>
emillon
changed the title
emillon
added a commit
to emillon/dune
that referenced
this pull request
Jul 25, 2023
Fixes ocaml#8210 If the `sendfile` branch failed, it leaves an empty target file, so retrying will fail. Instead we reuse the fd directly. Signed-off-by: Etienne Millon <me@emillon.org>
emillon
added a commit
to emillon/dune
that referenced
this pull request
Jul 25, 2023
Fixes ocaml#8210 If the `sendfile` branch failed, it leaves an empty target file, so retrying will fail. Instead we reuse the fd directly. Signed-off-by: Etienne Millon <me@emillon.org>
emillon
added a commit
that referenced
this pull request
Jul 25, 2023
* test: repro for #8210 (EACCESS if sendfile fails) What's happening here is: - input and output files are open - sendfile is attempted and fails - both files are closed - input file is opened again - output file is opened again (but already exists) This throws an error if the output file is not writable. Signed-off-by: Etienne Millon <me@emillon.org> * refactor: use Exn.protect instead of protectx (#8235) This adds a layer of rebinding that obscures what is going on. Signed-off-by: Etienne Millon <me@emillon.org> * fix(sendfile): unlink dst before fallback (#8234) Fixes #8210 If the `sendfile` branch failed, it leaves an empty target file, so retrying will fail. Instead we reuse the fd directly. Signed-off-by: Etienne Millon <me@emillon.org> --------- Signed-off-by: Etienne Millon <me@emillon.org>
emillon
added a commit
to emillon/opam-repository
that referenced
this pull request
Jul 25, 2023
CHANGES: - Disable background digests on Windows. This prevents an issue where unremovable files would make dune crash when the shared cache is enabled. (ocaml/dune#8243, fixes ocaml/dune#8228, @emillon) - Fix permission errors when `sendfile` is not available (ocaml/dune#8234, fixes ocaml/dune#8120, @emillon)
pmwhite
pushed a commit
to pmwhite/dune
that referenced
this pull request
Aug 10, 2023
Fixes ocaml#8210 If the `sendfile` branch failed, it leaves an empty target file, so retrying will fail. Instead we reuse the fd directly. Signed-off-by: Etienne Millon <me@emillon.org>
nberth
pushed a commit
to nberth/opam-repository
that referenced
this pull request
Jun 18, 2024
CHANGES: - Disable background digests on Windows. This prevents an issue where unremovable files would make dune crash when the shared cache is enabled. (ocaml/dune#8243, fixes ocaml/dune#8228, @emillon) - Fix permission errors when `sendfile` is not available (ocaml/dune#8234, fixes ocaml/dune#8120, @emillon)
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.
Fixes #8210
If the
sendfilebranch failed, it left an empty target file.This file needs to be removed, otherwise the next
opencall can fail if the file is not writeable.