Skip to content
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

Reland changes replacing num_cpus with available_parallelism #100586

Merged
merged 1 commit into from
Aug 15, 2022

Conversation

the8472
Copy link
Member

@the8472 the8472 commented Aug 15, 2022

Since #97925 added cgroupv1 support the problem in #97549 which lead to the previous revert should be addressed now.

Cargo has reapplied the replacement too rust-lang/cargo#10969

Reverts 1ae4b25 (part of #97911)
Relands #94524

@rustbot rustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Aug 15, 2022
@rust-highfive
Copy link
Collaborator

r? @jyn514

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 15, 2022
@jyn514
Copy link
Member

jyn514 commented Aug 15, 2022

Since #97925 added cgroupv1 support the problem in #97549 which lead to the previous revert should be addressed now.

Is there some way to test this?

@the8472
Copy link
Member Author

the8472 commented Aug 15, 2022

You need an older linux, e.g. debian 9. Or systemd configured to use cgroupv1 instead of v2 (the latter is the default in recent versions).

@jyn514
Copy link
Member

jyn514 commented Aug 15, 2022

Ok, sounds like you have a good idea of what the bug was, I'm going to assume someone's tested this :)

I seen in Cargo.lock that we still have nums_cpus somewhere in the dependency tree, do you mind figuring out where that comes from? r=me with that done (I expect it will be in RLS or something, just want to make sure it's intentional).

@the8472
Copy link
Member Author

the8472 commented Aug 15, 2022

Yes, there was some manual testing done in #97925 by ehuss and me.

num_cpus is still used in

  • tools/build-manifest; via rayon
  • clippy; dev_depencency; via tokio and compiletest_rs
  • tools/rust-installer; direct dependency
  • rls; direct dependency

Edit: grepping also shows rust-analyzer and miri/test_dependencies, but those are not workspace members

@the8472
Copy link
Member Author

the8472 commented Aug 15, 2022

@bors r=jyn514 rollup

@bors
Copy link
Contributor

bors commented Aug 15, 2022

📌 Commit 8453122 has been approved by jyn514

It is now in the queue for this repository.

@bors 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 Aug 15, 2022
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 15, 2022
…=jyn514

Reland changes replacing num_cpus with available_parallelism

Since rust-lang#97925 added cgroupv1 support the problem in rust-lang#97549 which lead to the previous revert should be addressed now.

Cargo has reapplied the replacement too rust-lang/cargo#10969

Reverts 1ae4b25 (part of rust-lang#97911)
Relands rust-lang#94524
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 15, 2022
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#100031 (improve "try ignoring the field" diagnostic)
 - rust-lang#100325 (Rustdoc-Json: Don't remove impls for items imported from private modules)
 - rust-lang#100377 (Replace - with _ in fluent slugs to improve developer workflows)
 - rust-lang#100458 (Adjust span of fn argument declaration)
 - rust-lang#100514 (Delay span bug when failing to normalize negative coherence impl subject due to other malformed impls)
 - rust-lang#100528 (Support 1st group of RISC-V Bitmanip backend target features)
 - rust-lang#100559 (Parser simplifications)
 - rust-lang#100568 (Fix STD build for ESP-IDF)
 - rust-lang#100582 ([rustdoc] Fix handling of stripped enum variant in JSON output format)
 - rust-lang#100586 (Reland changes replacing num_cpus with available_parallelism )

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit e65de39 into rust-lang:master Aug 15, 2022
@rustbot rustbot added this to the 1.65.0 milestone Aug 15, 2022
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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants