github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-05-01 05:04:26 +00:00
Code Issues Projects Releases Wiki Activity

runtime-rs: check peer close in log_forwarder

Browse Source 
The log_forwarder task does not check if the peer has closed, causing a
meaningless loop during the period of “kata vm exit”, when the peer
closed, and “ShutdownContainer RPC received” that aborts the log forwarder.

This patch fixes the problem.

Fixes: #7741

Signed-off-by: Zixuan Tan <tanzixuan.me@gmail.com>
This commit is contained in:
Zixuan Tan 2023-08-25 19:00:07 +08:00
parent a6921dd837
commit dffc16e5b3
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/runtime-rs/crates/agent/src/log_forwarder.rs
View File

@ -64,8 +64,7 @@ impl LogForwarder {
Ok(stream) => { Ok(stream) => {
let stream = BufReader::new(stream); let stream = BufReader::new(stream);
let mut lines = stream.lines(); let mut lines = stream.lines();
while let Ok(line) = lines.next_line().await { while let Ok(Some(l)) = lines.next_line().await {
if let Some(l) = line {
match parse_agent_log_level(&l) { match parse_agent_log_level(&l) {
LOG_LEVEL_TRACE => trace!(sl!(), "{}", l), LOG_LEVEL_TRACE => trace!(sl!(), "{}", l),
LOG_LEVEL_DEBUG => debug!(sl!(), "{}", l), LOG_LEVEL_DEBUG => debug!(sl!(), "{}", l),
@ -76,7 +75,6 @@ impl LogForwarder {
} }
} }
} }
}
Err(err) => { Err(err) => {
warn!(logger, "connect agent vsock failed: {:?}", err); warn!(logger, "connect agent vsock failed: {:?}", err);
} }