diff options
author | Florian Klink <flokli@flokli.de> | 2024-06-13T07·26+0300 |
---|---|---|
committer | clbot <clbot@tvl.fyi> | 2024-06-13T16·16+0000 |
commit | 99c5a2e8bcb83e595d2c12bf7296338b1687f9de (patch) | |
tree | de564c7c639f696f5d4a435c4fa910b9114ab2fd /tvix/glue/src/tvix_store_io.rs | |
parent | 7ee55c293cc47a6b3bebacd4d991aa9aa9cc7287 (diff) |
feat(tvix/glue): report progress on all fetches, use progress bars r/8259
This should also report progress on fetches which we couldn't delay until actually having to IO into them, like `builtins.fetchurl` calls without a upfront-provided hash. While at it, upgrade the progress spinners to progress bars, which increment if we know the size of the fetch. Change-Id: Ic3f332286d8bc2177f3d994ba25b165728d4b702 Reviewed-on: https://cl.tvl.fyi/c/depot/+/11797 Autosubmit: flokli <flokli@flokli.de> Tested-by: BuildkiteCI Reviewed-by: aspen <root@gws.fyi>
Diffstat (limited to 'tvix/glue/src/tvix_store_io.rs')
-rw-r--r-- | tvix/glue/src/tvix_store_io.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tvix/glue/src/tvix_store_io.rs b/tvix/glue/src/tvix_store_io.rs index 8ea964d18650..ad9e4a8ef897 100644 --- a/tvix/glue/src/tvix_store_io.rs +++ b/tvix/glue/src/tvix_store_io.rs @@ -135,9 +135,6 @@ impl TvixStoreIO { // it for things like <nixpkgs> pointing to a store path. // In the future, these things will (need to) have PathInfo. None => { - let span = Span::current(); - span.pb_start(); - span.pb_set_style(&tvix_tracing::PB_SPINNER_STYLE); // The store path doesn't exist yet, so we need to fetch or build it. // We check for fetches first, as we might have both native // fetchers and FODs in KnownPaths, and prefer the former. @@ -150,7 +147,6 @@ impl TvixStoreIO { match maybe_fetch { Some((name, fetch)) => { - span.pb_set_message(&format!("⏳Fetching {}", &store_path)); let (sp, root_node) = self .fetcher .ingest_and_persist(&name, fetch) @@ -183,6 +179,9 @@ impl TvixStoreIO { } } }; + let span = Span::current(); + span.pb_start(); + span.pb_set_style(&tvix_tracing::PB_SPINNER_STYLE); span.pb_set_message(&format!("🔨Building {}", &store_path)); // derivation_to_build_request needs castore nodes for all inputs. |