Revert "Release a jobserver token while locking a file"#7201
Merged
Conversation
This reverts commit d19b41f.
|
r? @nrc (rust_highfive has picked a reviewer for you, use r? to override) |
Member
Author
|
r? @ehuss |
Contributor
|
Ah, I shoulda reviewed a little more closely. @bors r+ Should we backport this to beta? |
Contributor
|
📌 Commit 20d9119 has been approved by |
Contributor
bors
added a commit
that referenced
this pull request
Aug 2, 2019
Revert "Release a jobserver token while locking a file" This reverts commit d19b41f. Discovered in #7200 this is just a straight up recipe for deadlock. One Cargo has a jobserver token and wants a file lock. Another Cargo has the file lock and wants a jobserver token. If we had a way to acquire a jobserver token in a nonblocking fashion we could perhaps solve this, but for now I think it's best to revert to the previous behavior. Closes #7200
Contributor
|
☀️ Test successful - checks-azure |
Member
Author
bors
added a commit
to rust-lang/rust
that referenced
this pull request
Aug 8, 2019
Update cargo 9 commits in 26092da337b948719549cd5ed3d1051fd847afd7..42a8c0adf91323c01228268c651aef5366b25b69 2019-07-31 23:24:32 +0000 to 2019-08-07 20:41:07 +0000 - Add support for customizing JSON diagnostics from Cargo (rust-lang/cargo#7214) - Bump rustfix (rust-lang/cargo#7221) - Fix remap-path-prefix from failing. (rust-lang/cargo#7219) - Clean up build script stuff and documentation. (rust-lang/cargo#7215) - Remove debug panic in package-features. (rust-lang/cargo#7213) - Fix an old test. (rust-lang/cargo#7208) - Remove unused AstBuilder (rust-lang/cargo#7210) - Revert "Release a jobserver token while locking a file" (rust-lang/cargo#7201) - improve error message for unmatched prerelease dependencies (rust-lang/cargo#7191)
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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 reverts commit d19b41f.
Discovered in #7200 this is just a straight up recipe for deadlock. One Cargo has a jobserver token and wants a file lock. Another Cargo has the file lock and wants a jobserver token. If we had a way to acquire a jobserver token in a nonblocking fashion we could perhaps solve this, but for now I think it's best to revert to the previous behavior.
Closes #7200