diff options
| author | Florian Klink <flokli@flokli.de> | 2024-04-30T15·48+0300 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2024-04-30T17·12+0000 |
| commit | c9d3946cb583631bc2ca4a1343f054f7ee64a626 (patch) | |
| tree | 358102f0d0f938ea01ba905d7672c609995aadfe /tvix/store | |
| parent | 77546d734efe704f52a4c89b5159cb2d98d5a8aa (diff) | |
refactor(tvix/castore/import): restructure error types r/8048
Have ingest_entries return an Error type with only three kinds: - Error while uploading a specific Directory - Error while finalizing the directory upload - Error from the producer Move all ingestion method-specific errors to the individual implementations. Change-Id: I2a015cb7ebc96d084cbe2b809f40d1b53a15daf3 Reviewed-on: https://cl.tvl.fyi/c/depot/+/11557 Autosubmit: flokli <flokli@flokli.de> Tested-by: BuildkiteCI Reviewed-by: Connor Brewster <cbrewster@hey.com>
Diffstat (limited to 'tvix/store')
| -rw-r--r-- | tvix/store/src/import.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tvix/store/src/import.rs b/tvix/store/src/import.rs index 7b6aeb824ea6..88cebc8be613 100644 --- a/tvix/store/src/import.rs +++ b/tvix/store/src/import.rs @@ -117,7 +117,9 @@ where DS: AsRef<dyn DirectoryService>, PS: AsRef<dyn PathInfoService>, { - let root_node = ingest_path(blob_service, directory_service, path.as_ref()).await?; + let root_node = ingest_path(blob_service, directory_service, path.as_ref()) + .await + .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))?; // Ask the PathInfoService for the NAR size and sha256 let (nar_size, nar_sha256) = path_info_service.as_ref().calculate_nar(&root_node).await?; |