-
Notifications
You must be signed in to change notification settings - Fork 12.8k
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
Do not attempt to unlock envlock in child process after a fork. #82949
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
r? @m-ou-se (rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
label
Mar 9, 2021
This comment has been minimized.
This comment has been minimized.
rustbot
added
the
T-libs-api
Relevant to the library API team, which will review and decide on the PR/issue.
label
Mar 9, 2021
This comment has been minimized.
This comment has been minimized.
the8472
force-pushed
the
forget-envlock-on-fork
branch
3 times, most recently
from
March 9, 2021 21:11
1610e35
to
1cce755
Compare
joshtriplett
requested changes
Mar 9, 2021
One minor nit; looks good otherwise. Once this goes in, I'd be happy to review and land a switch back to an rwlock here. |
This is a breaking change for cases where the environment is accessed in a Command::pre_exec closure. Except for single-threaded programs these uses were not correct anyway since they aren't async-signal safe.
the8472
force-pushed
the
forget-envlock-on-fork
branch
from
March 9, 2021 21:14
1cce755
to
d854789
Compare
joshtriplett
approved these changes
Mar 9, 2021
LGTM, r=me once CI passes. |
It passed, you'll have to poke bors. |
@bors r+ |
📌 Commit d854789 has been approved by |
bors
added
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
and removed
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
Mar 9, 2021
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 10, 2021
Rollup of 9 pull requests Successful merges: - rust-lang#81309 (always eagerly eval consts in Relate) - rust-lang#82217 (Edition-specific preludes) - rust-lang#82807 (rustdoc: Remove redundant enableSearchInput function) - rust-lang#82924 (WASI: Switch to crt1-command.o to enable support for new-style commands) - rust-lang#82949 (Do not attempt to unlock envlock in child process after a fork.) - rust-lang#82955 (fix: wrong word) - rust-lang#82962 (Treat header as first paragraph for shortened markdown descriptions) - rust-lang#82976 (fix error message for copy(_nonoverlapping) overflow) - rust-lang#82977 (Rename `Option::get_or_default` to `get_or_insert_default`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 15, 2021
use RWlock when accessing os::env (take 2) This reverts commit acdca31 (rust-lang#82877) i.e. redoes rust-lang#81850 since the invalid unlock attempts in the child process have been fixed in rust-lang#82949 r? `@joshtriplett`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
T-libs-api
Relevant to the library API team, which will review and decide on the PR/issue.
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.
This implements the first two points from #64718 (comment)
This is a breaking change for cases where the environment is accessed in a Command::pre_exec closure. Except for single-threaded programs these uses were not correct anyway since they aren't async-signal safe.
Note that we had a ui test that explicitly tried
env::set_var
inpre_exec
. As expected it failed with these changes when I tested locally.