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

pass through an RpcFinished(None) when grpc write streams are terminated early #7422

Merged
merged 2 commits into from
Apr 12, 2019
Merged

pass through an RpcFinished(None) when grpc write streams are terminated early #7422

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3644a17
swallow an RpcFinished(None) result when writing to the remote store
cosmicexplorer Apr 11, 2019
34b25b7
fix comment
cosmicexplorer Apr 12, 2019
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
27 changes: 21 additions & 6 deletions src/rust/engine/fs/src/store.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1872,7 +1872,7 @@ mod remote {
digest, err
))
.to_boxed(),
Ok(((sender, receiver), client)) => {
Ok(((sender, receiver), _client)) => {
let chunk_size_bytes = store.chunk_size_bytes;
let resource_name = resource_name.clone();
let bytes = bytes.clone();
Expand All @@ -1898,11 +1898,26 @@ mod remote {
}
});

future::ok(client)
.join(sender.send_all(stream).map_err(move |e| {
format!("Error attempting to upload digest {:?}: {:?}", digest, e)
}))
.and_then(move |_| {
sender
.send_all(stream)
.map(|_| ())
.or_else(move |e| {
match e {
// NB(#7422): This can sometimes occur when pants sends many process execution
cosmicexplorer marked this conversation as resolved.
Show resolved Hide resolved
// requests which depend on the same large file at the same time. It appears that
// the check_alive() method in grpc-rs which returns RpcFinished(None) is used as
// a way to exit early out of methods which return a Result, if the future's
// contents are already available. This may be a race condition that deserves
// respect, but right now it's not clear it's an error. See #6344 for a case where
// we override this type of behavior by forking gprcio.
grpcio::Error::RpcFinished(None) => Ok(()),
e => Err(format!(
"Error attempting to upload digest {:?}: {:?}",
digest, e
)),
}
})
.and_then(move |()| {
receiver.map_err(move |e| {
format!(
"Error from server when uploading digest {:?}: {:?}",
Expand Down