github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-25 11:13:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1447 from liubin/liubin/fix-1369

Browse Source 
agent: Stop receive message from Receiver if got None
This commit is contained in:
Tim Zhang 2021-02-24 16:48:24 +08:00 committed by GitHub
commit 2c42be0ca6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/agent/rustjail/src/cgroups/notifier.rs
View File

@ -191,7 +191,10 @@ async fn register_memory_event(
let content = fs::read_to_string(path.clone());
info!(
sl!(),
"OOM event for container: {}, content: {:?}", &containere_id, content
"cgroup event for container: {}, path: {:?}, content: {:?}",
&containere_id,
&path,
content
);
}
}

6
src/agent/src/sandbox.rs
View File

@ -317,7 +317,13 @@ impl Sandbox {
tokio::spawn(async move {
loop {
let event = rx.recv().await;
// None means the container has exited,
// and sender in OOM notifier is dropped.
if event.is_none() {
return;
}
info!(logger, "got an OOM event {:?}", event);
let _ = tx
.send(container_id.clone())
.await