Don't error if guest calls proc_exit with exit code 0 #323
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lann
reviewed
Apr 6, 2022
crates/http/src/wagi.rs
Outdated
| @@ -110,7 +110,7 @@ impl HttpExecutor for WagiHttpExecutor { | |||
| // even if the guest code fails. (And when checking, check the guest | |||
| // result first, so that guest failures are returned in preference to | |||
| // log failures.) | |||
| guest_result??; | |||
| ignore_successful_proc_exit_trap(guest_result?)?; | |||
There was a problem hiding this comment.
Perhaps slightly Rustier equivalent:
guest_result?.or_else(ignore_successful_proc_exit_trap)?;
...
fn ignore_successful_proc_exit_trap(guest_err: anyhow::Error) -> Result<()> {
match guest_err.root_cause()...
lann
approved these changes
Apr 6, 2022
|
Wha! Good find! That is not what I would have expected to be the root of Zig's error. |
radu-matei
approved these changes
Apr 6, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #321.
The issue, as discussed there, is that Zig
build-exegenerates a module that calls WASIproc_exit. This is realised in Wasmtime as a trap, and any trap is realised in Rust as an error. This PR rather recovers the trap and checks whether it was a benign exit.This needs to be backported to WAGI. I think it's not needed for the Spin executor but would appreciate other folks' thoughts on that!