maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(tvix/directoryservice): clarify get_recursive not found

Browse source 
Change-Id: I47f21b4b7db9304eadb04094d41bf04d443fcc3b
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12025
Tested-by: BuildkiteCI
Reviewed-by: flokli <flokli@flokli.de>
Autosubmit: yuka <yuka@yuka.dev>
This commit is contained in:
Yureka 2024-07-23 15:32:11 +02:00 • committed by clbot
parent b9aa6456e2
commit 94a0e21e68
4 changed files with 41 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
tvix/castore/src/directoryservice/utils.rs
View file

@ -25,23 +25,31 @@ pub fn traverse_directory<'a, DS: DirectoryService + 'static>(
// We omit sending the same directories multiple times.
let mut sent_directory_digests: HashSet<B3Digest> = HashSet::new();
let root_directory_digest = root_directory_digest.clone();
Box::pin(try_stream! {
while let Some(current_directory_digest) = worklist_directory_digests.pop_front() {
let current_directory = directory_service.get(&current_directory_digest).await.map_err(|e| {
let current_directory = match directory_service.get(&current_directory_digest).await.map_err(|e| {
warn!("failed to look up directory");
Error::StorageError(format!(
"unable to look up directory {}: {}",
current_directory_digest, e
))
})?.ok_or_else(|| {
// if it's not there, we have an inconsistent store!
warn!("directory {} does not exist", current_directory_digest);
Error::StorageError(format!(
"directory {} does not exist",
current_directory_digest
))
})? {
// the root node of the requested closure was not found, return an empty list
None if current_directory_digest == root_directory_digest => break,
// if a child directory of the closure is not there, we have an inconsistent store!
None => {
warn!("directory {} does not exist", current_directory_digest);
Err(Error::StorageError(format!(
"directory {} does not exist",
current_directory_digest
)))?;
break;
}
Some(dir) => dir,
};
})?;
// validate, we don't want to send invalid directories.
current_directory.validate().map_err(|e| {