github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-28 16:27:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #825 from lifupan/2.0-dev

Browse Source 
agent: propagate the internal detail errors to users
This commit is contained in:
Julio Montes 2020-09-29 12:12:34 -05:00 committed by GitHub
commit c32af06fc6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/agent/src/rpc.rs
View File

@ -891,10 +891,10 @@ impl protocols::agent_ttrpc::AgentService for agentService {
let p = match find_process(&mut sandbox, cid.as_str(), eid.as_str(), false) { let p = match find_process(&mut sandbox, cid.as_str(), eid.as_str(), false) {
Ok(v) => v, Ok(v) => v,
Err(_) => { Err(e) => {
return Err(ttrpc::Error::RpcStatus(ttrpc::get_status( return Err(ttrpc::Error::RpcStatus(ttrpc::get_status(
ttrpc::Code::INVALID_ARGUMENT, ttrpc::Code::INVALID_ARGUMENT,
"invalid argument".to_string(), format!("invalid argument: {:?}", e),
))); )));
} }
}; };
@ -923,10 +923,10 @@ impl protocols::agent_ttrpc::AgentService for agentService {
let mut sandbox = s.lock().unwrap(); let mut sandbox = s.lock().unwrap();
let p = match find_process(&mut sandbox, cid.as_str(), eid.as_str(), false) { let p = match find_process(&mut sandbox, cid.as_str(), eid.as_str(), false) {
Ok(v) => v, Ok(v) => v,
Err(_e) => { Err(e) => {
return Err(ttrpc::Error::RpcStatus(ttrpc::get_status( return Err(ttrpc::Error::RpcStatus(ttrpc::get_status(
ttrpc::Code::UNAVAILABLE, ttrpc::Code::UNAVAILABLE,
"cannot find the process".to_string(), format!("invalid argument: {:?}", e),
))); )));
} }
}; };
@ -948,10 +948,10 @@ impl protocols::agent_ttrpc::AgentService for agentService {
}; };
let err = libc::ioctl(fd, TIOCSWINSZ, &win); let err = libc::ioctl(fd, TIOCSWINSZ, &win);
if let Err(_) = Errno::result(err).map(drop) { if let Err(e) = Errno::result(err).map(drop) {
return Err(ttrpc::Error::RpcStatus(ttrpc::get_status( return Err(ttrpc::Error::RpcStatus(ttrpc::get_status(
ttrpc::Code::INTERNAL, ttrpc::Code::INTERNAL,
"ioctl error".to_string(), format!("ioctl error: {:?}", e),
))); )));
} }
} }
@ -976,10 +976,10 @@ impl protocols::agent_ttrpc::AgentService for agentService {
let iface = match rtnl.update_interface(interface.as_ref().unwrap()) { let iface = match rtnl.update_interface(interface.as_ref().unwrap()) {
Ok(v) => v, Ok(v) => v,
Err(_) => { Err(e) => {
return Err(ttrpc::Error::RpcStatus(ttrpc::get_status( return Err(ttrpc::Error::RpcStatus(ttrpc::get_status(
ttrpc::Code::INTERNAL, ttrpc::Code::INTERNAL,
"update interface".to_string(), format!("update interface: {:?}", e),
))); )));
} }
}; };
@ -1005,10 +1005,10 @@ impl protocols::agent_ttrpc::AgentService for agentService {
// get current routes to return when error out // get current routes to return when error out
let crs = match rtnl.list_routes() { let crs = match rtnl.list_routes() {
Ok(routes) => routes, Ok(routes) => routes,
Err(_) => { Err(e) => {
return Err(ttrpc::Error::RpcStatus(ttrpc::get_status( return Err(ttrpc::Error::RpcStatus(ttrpc::get_status(
ttrpc::Code::INTERNAL, ttrpc::Code::INTERNAL,
"update routes".to_string(), format!("update routes: {:?}", e),
))); )));
} }
}; };
@ -1037,10 +1037,10 @@ impl protocols::agent_ttrpc::AgentService for agentService {
let rtnl = sandbox.rtnl.as_mut().unwrap(); let rtnl = sandbox.rtnl.as_mut().unwrap();
let v = match rtnl.list_interfaces() { let v = match rtnl.list_interfaces() {
Ok(value) => value, Ok(value) => value,
Err(_) => { Err(e) => {
return Err(ttrpc::Error::RpcStatus(ttrpc::get_status( return Err(ttrpc::Error::RpcStatus(ttrpc::get_status(
ttrpc::Code::INTERNAL, ttrpc::Code::INTERNAL,
"list interface".to_string(), format!("list interface: {:?}", e),
))); )));
} }
}; };
@ -1066,10 +1066,10 @@ impl protocols::agent_ttrpc::AgentService for agentService {
let v = match rtnl.list_routes() { let v = match rtnl.list_routes() {
Ok(value) => value, Ok(value) => value,
Err(_) => { Err(e) => {
return Err(ttrpc::Error::RpcStatus(ttrpc::get_status( return Err(ttrpc::Error::RpcStatus(ttrpc::get_status(
ttrpc::Code::INTERNAL, ttrpc::Code::INTERNAL,
"list routes".to_string(), format!("list routes: {:?}", e),
))); )));
} }
}; };