Interleave downloads with installations when downloading a toolchain #4471
Conversation
FranciscoTGouveia
force-pushed
the
install-after-download
branch
from
c4b68b2 to
c2954ba
Compare
Even though downloads are done concurrently, the installations are done sequentially. This means that, as downloads complete, they are in a queue (an mpsc channel) waiting to be consumed by the future responsible for the (sequential) installations.
…ation with a download
…ow a component was installed
FranciscoTGouveia
force-pushed
the
install-after-download
branch
from
c2954ba to
1d7e5f5
Compare
| if counter >= total_components { | ||
| break; | ||
| } | ||
| if let Some(message) = download_rx.recv().await { |
There was a problem hiding this comment.
Could it be that the counter never gets incremented because .recv().await returns None?
Did you mean something like this instead?
while counter < total_components && let Some(_) = ... { ...; counter += 1; }| Ok(new_tx) => { | ||
| current_tx = new_tx; | ||
| } | ||
| Err(e) => { |
There was a problem hiding this comment.
If I'm not mistaken, Err(e) => return Err(e) is just ? 🤔
| @@ -35,7 +35,6 @@ async fn rustup_stable() { | |||
| .with_stderr(snapbox::str![[r#" | |||
| info: syncing channel updates for 'stable-[HOST_TRIPLE]' | |||
| info: latest update on 2015-01-02, rust version 1.1.0 (hash-stable-1.1.0) | |||
| info: downloading component[..] | |||
There was a problem hiding this comment.
Possibly squash this commit with the one that has broken these tests.
| @@ -122,6 +124,13 @@ impl Display for Notification<'_> { | |||
| write!(f, "installing component '{}' for '{}'", c, t.unwrap()) | |||
| } | |||
| } | |||
| ComponentInstalled(c, h, t) => { | |||
| if Some(h) == t.as_ref() || t.is_none() { | |||
There was a problem hiding this comment.
Nit: Now that we are at it, I would probably give an extra commit to avoid the t.unwrap() here by flipping the if and writing something like:
if let Some(t) = t && t != h { ... } else { ... }| ProgressStyle::with_template( if pb.position() != 0 { | ||
| "{msg:>12.bold} downloaded {total_bytes} in {elapsed} installing now {spinner:.green}" | ||
| } else { | ||
| "{msg:>12.bold} component already downloaded, installing now {spinner:.green}" |
There was a problem hiding this comment.
Nit: the , installing now, installing now and and installed might seem inconsistent. How about just and installed and and installing? I believe the spinner can compensate for the minor difference.
Continuation of #4436.
This change aims to speed up the overall performance of the
rustup [toolchain] installcommand by allowing the installation of a component to start immediately after its download completes.This approach is particularly beneficial for slower connections, as it enables installations to progress in parallel with ongoing downloads -- so by the time all downloads are finished, all installations should be completed as well.
NB: This PR is not yet ready for review. I believe this change should be backed by benchmarks and user feedback before moving forward. I’ll share those here in the next couple of days.