Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 20:14:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

kill action on timeout even if exec

Browse Source
This commit is contained in:
Aiden McClelland
2021-11-17 12:03:24 -07:00
committed by Aiden McClelland
parent 071f6cec03
commit 1d1844e092
1 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
appmgr/src/action/docker.rs
View File

@@ -6,6 +6,9 @@ use std::path::PathBuf;
use std::time::Duration; use std::time::Duration;
use bollard::container::StopContainerOptions; use bollard::container::StopContainerOptions;
use futures::future::Either as EitherFuture;
use nix::sys::signal;
use nix::unistd::Pid;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_json::Value; use serde_json::Value;
use tracing::instrument; use tracing::instrument;
@@ -51,8 +54,6 @@ impl DockerAction {
timeout: Option<Duration>, timeout: Option<Duration>,
) -> Result<Result<O, (i32, String)>, Error> { ) -> Result<Result<O, (i32, String)>, Error> {
let mut cmd = tokio::process::Command::new("docker"); let mut cmd = tokio::process::Command::new("docker");
let mut timeout_fut =
futures::future::Either::Left(futures::future::pending::<Result<_, Error>>());
if self.inject && allow_inject { if self.inject && allow_inject {
cmd.arg("exec"); cmd.arg("exec");
} else { } else {
@@ -63,24 +64,6 @@ impl DockerAction {
.arg(format!("--add-host=embassy:{}", Ipv4Addr::from(HOST_IP))) .arg(format!("--add-host=embassy:{}", Ipv4Addr::from(HOST_IP)))
.arg("--name") .arg("--name")
.arg(&container_name); .arg(&container_name);
if let Some(timeout) = timeout {
timeout_fut = futures::future::Either::Right(async move {
tokio::time::sleep(timeout).await;
match ctx
.docker
.stop_container(&container_name, Some(StopContainerOptions { t: 30 }))
.await
{
Err(bollard::errors::Error::DockerResponseNotFoundError { .. })
| Err(bollard::errors::Error::DockerResponseConflictError { .. })
| Err(bollard::errors::Error::DockerResponseNotModifiedError { .. }) => (), // Already stopped
a => a?,
};
Ok(futures::future::pending().await)
});
}
} }
cmd.args( cmd.args(
self.docker_args(ctx, pkg_id, pkg_version, volumes, allow_inject) self.docker_args(ctx, pkg_id, pkg_version, volumes, allow_inject)
@@ -102,6 +85,28 @@ impl DockerAction {
.join(" ") .join(" ")
); );
let mut handle = cmd.spawn().with_kind(crate::ErrorKind::Docker)?; let mut handle = cmd.spawn().with_kind(crate::ErrorKind::Docker)?;
let id = handle.id();
let timeout_fut = if let Some(timeout) = timeout {
EitherFuture::Right(async move {
tokio::time::sleep(timeout).await;
if let Some(id) = id {
signal::kill(Pid::from_raw(id as i32), nix::sys::signal::SIGTERM)
.with_kind(crate::ErrorKind::Docker)?;
}
tokio::time::sleep(Duration::from_secs(30)).await;
if let Some(id) = id {
signal::kill(Pid::from_raw(id as i32), signal::SIGKILL)
.with_kind(crate::ErrorKind::Docker)?;
}
Ok(futures::future::pending().await)
})
} else {
EitherFuture::Left(futures::future::pending::<Result<_, Error>>())
};
if let (Some(input), Some(stdin)) = (&input_buf, &mut handle.stdin) { if let (Some(input), Some(stdin)) = (&input_buf, &mut handle.stdin) {
use tokio::io::AsyncWriteExt; use tokio::io::AsyncWriteExt;
stdin stdin