mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(tvix/store/fs): don't panic on PathInfoService error

Browse source 
An error in the PathInfoService request can appear in case the
underlying request returns an error.

We shouldn't panic and bork the fuse mount, but instead return an IO
error.

Change-Id: I2daeae629e1627d06adcd7b82ddb76c50c602212
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10154
Tested-by: BuildkiteCI
Reviewed-by: Connor Brewster <cbrewster@hey.com>
This commit is contained in:
Florian Klink 2023-11-27 20:52:24 +02:00 committed by flokli
parent 84a846a3a2
commit fce9c0e99e
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tvix/store/src/fs/mod.rs
View file

@ -232,19 +232,17 @@ impl TvixStoreFs {
} }
// We don't have it yet, look it up in [self.path_info_service]. // We don't have it yet, look it up in [self.path_info_service].
match self match self.tokio_handle.block_on({
.tokio_handle
.block_on({
let path_info_service = self.path_info_service.clone(); let path_info_service = self.path_info_service.clone();
let digest = *store_path.digest(); let digest = *store_path.digest();
async move { path_info_service.get(digest).await } async move { path_info_service.get(digest).await }
}) }) {
.unwrap() // if there was an error looking up the path_info, propagate up an IO error.
{ Err(_e) => Err(io::Error::from_raw_os_error(libc::EIO)),
// the pathinfo doesn't exist, so the file doesn't exist. // the pathinfo doesn't exist, so the file doesn't exist.
None => Err(io::Error::from_raw_os_error(libc::ENOENT)), Ok(None) => Err(io::Error::from_raw_os_error(libc::ENOENT)),
// The pathinfo does exist // The pathinfo does exist
Some(path_info) => { Ok(Some(path_info)) => {
// There must be a root node (ensured by the validation happening inside clients) // There must be a root node (ensured by the validation happening inside clients)
let root_node = path_info.node.unwrap().node.unwrap(); let root_node = path_info.node.unwrap().node.unwrap();