Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

wasm: handle cache loading errors #2215

Merged
merged 2 commits into from
Dec 7, 2023
Merged

wasm: handle cache loading errors #2215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbd6694
wasm: handle cache loading errors
tzemanovic Nov 27, 2023
85957df
changelog: add #2215
tzemanovic Nov 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .changelog/unreleased/improvements/2215-vp-less-permissive.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Handle errors on loading WASMs from file-system compilation cache.
([\#2215](https://github.com/anoma/namada/pull/2215))
74 changes: 51 additions & 23 deletions shared/src/vm/wasm/compilation_cache/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,16 +156,22 @@ impl<N: CacheName, A: WasmCacheAccess> Cache<N, A> {
return Ok(Some((module.clone(), store())));
}

let (module, store) = file_load_module(&self.dir, hash);
tracing::info!(
"{} found {} in file cache.",
N::name(),
hash.to_string()
);
// Put into cache, ignore result if it's full
let _ = in_memory.put_with_weight(*hash, module.clone());
if let Ok((module, store)) =
file_load_module(&self.dir, hash)
{
tracing::info!(
"{} found {} in file cache.",
N::name(),
hash.to_string()
);
// Put into cache, ignore result if it's full
let _ =
in_memory.put_with_weight(*hash, module.clone());

return Ok(Some((module, store)));
return Ok(Some((module, store)));
} else {
return Ok(None);
}
}
Some(Compilation::Compiling) => {
drop(progress);
Expand All @@ -183,11 +189,15 @@ impl<N: CacheName, A: WasmCacheAccess> Cache<N, A> {
let (module, store) = if module_file_exists(&self.dir, hash)
{
tracing::info!(
"Loading {} {} from file.",
"Trying to load {} {} from file.",
N::name(),
hash.to_string()
);
file_load_module(&self.dir, hash)
if let Ok(res) = file_load_module(&self.dir, hash) {
res
} else {
return Ok(None);
}
} else {
return Ok(None);
};
Expand Down Expand Up @@ -246,13 +256,18 @@ impl<N: CacheName, A: WasmCacheAccess> Cache<N, A> {
return Ok(Some((module.clone(), store())));
}

let (module, store) = file_load_module(&self.dir, hash);
tracing::info!(
"{} found {} in file cache.",
N::name(),
hash.to_string()
);
return Ok(Some((module, store)));
if let Ok((module, store)) =
file_load_module(&self.dir, hash)
{
tracing::info!(
"{} found {} in file cache.",
N::name(),
hash.to_string()
);
return Ok(Some((module, store)));
} else {
return Ok(None);
}
}
Some(Compilation::Compiling) => {
drop(progress);
Expand All @@ -270,11 +285,15 @@ impl<N: CacheName, A: WasmCacheAccess> Cache<N, A> {

return if module_file_exists(&self.dir, hash) {
tracing::info!(
"Loading {} {} from file.",
"Trying to load {} {} from file.",
N::name(),
hash.to_string()
);
Ok(Some(file_load_module(&self.dir, hash)))
if let Ok(res) = file_load_module(&self.dir, hash) {
return Ok(Some(res));
} else {
return Ok(None);
}
} else {
Ok(None)
};
Expand Down Expand Up @@ -478,13 +497,22 @@ fn file_write_module(dir: impl AsRef<Path>, module: &Module, hash: &Hash) {
fs_cache.store(CacheHash::new(hash.0), module).unwrap();
}

fn file_load_module(dir: impl AsRef<Path>, hash: &Hash) -> (Module, Store) {
fn file_load_module(
dir: impl AsRef<Path>,
hash: &Hash,
) -> Result<(Module, Store), wasmer::DeserializeError> {
use wasmer_cache::Cache;
let fs_cache = fs_cache(dir, hash);
let store = store();
let hash = CacheHash::new(hash.0);
let module = unsafe { fs_cache.load(&store, hash) }.unwrap();
(module, store)
let module = unsafe { fs_cache.load(&store, hash) };
if let Err(err) = module.as_ref() {
tracing::error!(
"Error loading cached wasm {}: {err}.",
hash.to_string()
);
}
Ok((module?, store))
}

fn fs_cache(dir: impl AsRef<Path>, hash: &Hash) -> FileSystemCache {
Expand Down
Loading