Skip to content

Commit ff9c777

Browse files
committed
Add more robust RPC handling + tests
1 parent eb59238 commit ff9c777

8 files changed

Lines changed: 1449 additions & 275 deletions

File tree

‎src/windows/wslopenvmm/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ add_custom_command(
2626
OUTPUT ${WSLOPENVMM_DLL}
2727
COMMAND ${CMAKE_COMMAND} -E env "VM_SERVICE_PROTO=${VM_SERVICE_PROTO}" ${CARGO_EXECUTABLE} build --manifest-path ${CMAKE_CURRENT_LIST_DIR}/Cargo.toml --target ${RUST_TARGET} --target-dir ${CARGO_TARGET_DIR} ${CARGO_BUILD_ARGUMENTS}
2828
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CARGO_OUTPUT} ${WSLOPENVMM_DLL}
29-
DEPENDS ${VM_SERVICE_PROTO} Cargo.lock Cargo.toml build.rs src/client.rs src/lib.rs src/af_unix.rs wslopenvmm.h
29+
DEPENDS ${VM_SERVICE_PROTO} Cargo.lock Cargo.toml build.rs src/client.rs src/lib.rs src/af_unix.rs src/rpc.rs wslopenvmm.h
3030
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
3131
VERBATIM)
3232

‎src/windows/wslopenvmm/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ prost = "0.14"
1616
prost-types = "0.14"
1717
tonic = "0.14"
1818
tonic-prost = "0.14"
19-
tokio = { version = "1", features = ["net", "rt", "time"] }
19+
tokio = { version = "1", features = ["net", "rt", "time", "macros", "sync"] }
2020
tower = "0.5"
2121
windows = { version = "0.62", features = ["Win32_Foundation"] }
2222
windows-sys = { version = "0.61", features = ["Win32_Networking_WinSock"] }

‎src/windows/wslopenvmm/src/af_unix.rs‎

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// Copyright (C) Microsoft Corporation. All rights reserved.
22

3+
use std::error::Error;
34
use std::io;
45
use std::path::{Path, PathBuf};
56
use std::time::Duration;
@@ -14,14 +15,33 @@ use tower::service_fn;
1415
pub async fn connect_channel(
1516
socket_path: PathBuf,
1617
timeout: Duration,
17-
) -> Result<Channel, tonic::transport::Error> {
18-
Endpoint::from_static("http://[::]:50051")
19-
.connect_timeout(timeout)
20-
.connect_with_connector(service_fn(move |_| {
21-
let socket_path = socket_path.clone();
22-
async move { open_socket(&socket_path, timeout).await.map(TokioIo::new) }
23-
}))
18+
) -> Result<Channel, io::Error> {
19+
let endpoint = Endpoint::from_static("http://[::]:50051").connect_timeout(timeout);
20+
let connection = endpoint.connect_with_connector(service_fn(move |_| {
21+
let socket_path = socket_path.clone();
22+
async move { open_socket(&socket_path, timeout).await.map(TokioIo::new) }
23+
}));
24+
tokio::time::timeout(timeout, connection)
2425
.await
26+
.map_err(|_| {
27+
io::Error::new(
28+
io::ErrorKind::TimedOut,
29+
"OpenVMM connection deadline expired",
30+
)
31+
})?
32+
.map_err(|error| {
33+
let mut source = error.source();
34+
while let Some(cause) = source {
35+
if let Some(error) = cause.downcast_ref::<io::Error>() {
36+
return match error.raw_os_error() {
37+
Some(code) => io::Error::from_raw_os_error(code),
38+
None => io::Error::new(error.kind(), error.to_string()),
39+
};
40+
}
41+
source = cause.source();
42+
}
43+
io::Error::new(io::ErrorKind::ConnectionAborted, error)
44+
})
2545
}
2646

2747
async fn open_socket(path: &Path, timeout: Duration) -> io::Result<TcpStream> {
@@ -62,4 +82,4 @@ async fn connect_socket(address: &SockAddr) -> io::Result<TcpStream> {
6282
return Err(error);
6383
}
6484
Ok(stream)
65-
}
85+
}

0 commit comments

Comments
 (0)