github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-26 19:48:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6680 from Tim-Zhang/fix-ut-bad-fd

Browse Source 
agent: Fix ut issue caused by fd double closed
This commit is contained in:
Fupan Li 2023-04-20 11:18:27 +08:00 committed by GitHub
commit ceefd50bd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/agent/src/main.rs
View File

@ -442,9 +442,8 @@ mod tests {
let msg = format!("test[{}]: {:?}", i, d); let msg = format!("test[{}]: {:?}", i, d);
let (rfd, wfd) = unistd::pipe2(OFlag::O_CLOEXEC).unwrap(); let (rfd, wfd) = unistd::pipe2(OFlag::O_CLOEXEC).unwrap();
defer!({ defer!({
// rfd is closed by the use of PipeStream in the crate_logger_task function, // XXX: Never try to close rfd, because it will be closed by PipeStream in
// but we will attempt to close in case of a failure // create_logger_task() and it's not safe to close the same fd twice time.
let _ = unistd::close(rfd);
unistd::close(wfd).unwrap(); unistd::close(wfd).unwrap();
}); });