Skip to content

fix(runc-shim): support realtime signals for exec processes #491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
immanuwell wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(runc-shim): support realtime signals for exec processes #491

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 27 additions & 9 deletions crates/runc-shim/src/runc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#[cfg(target_os = "linux")]
use std::sync::RwLock;
use std::{
convert::TryFrom,
os::{
fd::{IntoRawFd, OwnedFd},
unix::{
Expand Down Expand Up @@ -49,7 +48,7 @@ use containerd_shim::{
Console, Error, ExitSignal, Result,
};
use log::{debug, error};
use nix::{sys::signal::kill, unistd::Pid};
use nix::errno::Errno;
use oci_spec::runtime::{LinuxResources, Process};
use runc::{Command, Runc, Spawner};
use tokio::{
Expand All @@ -75,6 +74,16 @@ pub type InitProcess = ProcessTemplate<RuncInitLifecycle>;

pub type RuncContainer = ContainerTemplate<InitProcess, ExecProcess, RuncExecFactory>;

fn signal_process(pid: i32, signal: u32) -> nix::Result<()> {
// SAFETY: `kill` does not dereference either argument.
let result = unsafe { libc::kill(pid, signal as libc::c_int) };
if result == -1 {
Err(Errno::last())
} else {
Ok(())
}
}

#[derive(Clone, Default)]
pub(crate) struct RuncFactory {}

Expand Down Expand Up @@ -533,12 +542,7 @@ impl ProcessLifecycle<ExecProcess> for RuncExecLifecycle {
Err(Error::NotFoundError("process already finished".to_string()))
} else {
let pid = p.pid;
let kill_future = tokio::task::spawn_blocking(move || {
kill(
Pid::from_raw(pid),
nix::sys::signal::Signal::try_from(signal as i32).unwrap(),
)
});
let kill_future = tokio::task::spawn_blocking(move || signal_process(pid, signal));

match tokio::time::timeout(std::time::Duration::from_secs(3), kill_future).await {
Ok(Ok(result)) => result.map_err(Into::into),
Expand Down Expand Up @@ -841,14 +845,28 @@ async fn wait_pid(pid: i32, s: Subscription) -> i32 {

#[cfg(test)]
mod tests {
use std::{os::unix::process::ExitStatusExt, path::Path, process::ExitStatus};
use std::{
os::unix::process::ExitStatusExt,
path::Path,
process::{Command as StdCommand, ExitStatus},
};
Comment on lines +848 to +852

use containerd_shim::util::{mkdir, write_str_to_file};
use runc::error::Error::CommandFailed;
use tokio::fs::remove_dir_all;

use super::signal_process;
use crate::{common::LOG_JSON_FILE, runc::runtime_error};

#[cfg(target_os = "linux")]
#[test]
fn signal_process_supports_realtime_signals() {
let mut process = StdCommand::new("sleep").arg("60").spawn().unwrap();

signal_process(process.id() as i32, libc::SIGRTMIN() as u32).unwrap();
assert!(!process.wait().unwrap().success());
}

#[tokio::test]
async fn test_runtime_error() {
let empty_err = CommandFailed {
Expand Down
Loading