From 85043dab6bcab79c310b1773e2c06a18e3bbe432 Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Mon, 13 Sep 2021 13:42:14 -0400 Subject: [PATCH] server: don't wait forever on conmon cgroup move fail If we haven't signaled on the stop pipe, then conmon will be sitting waiting to be told to start Instead, we need to kill the process. Signed-off-by: Peter Hunt --- internal/oci/runtime_oci.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/oci/runtime_oci.go b/internal/oci/runtime_oci.go index 1dd45348c42..a2fe6077969 100644 --- a/internal/oci/runtime_oci.go +++ b/internal/oci/runtime_oci.go @@ -169,8 +169,8 @@ func (r *runtimeOCI) CreateContainer(ctx context.Context, c *Container, cgroupPa // Platform specific container setup if err := r.createContainerPlatform(c, cgroupParent, cmd.Process.Pid); err != nil { - if waitErr := cmd.Wait(); waitErr != nil { - return errors.Wrap(err, waitErr.Error()) + if killErr := cmd.Process.Kill(); killErr != nil { + return errors.Wrap(err, killErr.Error()) } return err }