containerd
/
rust-extensions
mirror of https://github.com/containerd/rust-extensions.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

shim: be more careful when removing stale socket files 

The function start_listener() tries to remove stale socket files when
syscall::bind() retune EADDRINUSE, let's be more careful to only remove
existing sockets instead of other types of files.

Signed-off-by: Liu Jiang <gerry@linux.alibaba.com>
This commit is contained in:
Liu Jiang 2021-12-12 21:52:06 +08:00
parent 63f62b9c9c
commit 0c83d7c04c
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crates/shim/src/lib.rs
View File

@ -22,6 +22,7 @@ use std::error;
use std::fs; use std::fs;
use std::hash::Hasher; use std::hash::Hasher;
use std::io::{self, Write}; use std::io::{self, Write};
use std::os::unix::fs::FileTypeExt;
use std::os::unix::io::AsRawFd; use std::os::unix::io::AsRawFd;
use std::os::unix::io::RawFd; use std::os::unix::io::RawFd;
use std::os::unix::net::UnixListener; use std::os::unix::net::UnixListener;
@ -302,11 +303,14 @@ fn start_listener(address: &str) -> Result<UnixListener, Error> {
UnixListener::bind(address).or_else(|e| { UnixListener::bind(address).or_else(|e| {
if e.kind() == io::ErrorKind::AddrInUse { if e.kind() == io::ErrorKind::AddrInUse {
fs::remove_file(address)?; if let Ok(md) = Path::new(address).metadata() {
UnixListener::bind(address).map_err(|e| e.into()) if md.file_type().is_socket() {
} else { fs::remove_file(address)?;
Err(e.into()) return UnixListener::bind(address).map_err(|e| e.into());
}
}
} }
Err(e.into())
}) })
} }