oci: kill process before delete

the OCI specs state that it is valid to delete a container only when
it is in the "stopped" state.

Signed-off-by: Giuseppe Scrivano <[email protected]>

Author: giuseppe

validation/pidfile/pidfile.go

@@ -7,6 +7,7 @@ import (
 	"os/exec"
 	"path/filepath"
 	"strconv"
+	"time"
 
 	tap "github.com/mndrix/tap-go"
 	"github.com/opencontainers/runtime-tools/validation/util"
@@ -31,7 +32,7 @@ func main() {
 	g.SetProcessArgs([]string{"true"})
 	config := util.LifecycleConfig{
 		Config:  g,
-		Actions: util.LifecycleActionCreate | util.LifecycleActionDelete,
+		Actions: util.LifecycleActionCreate | util.LifecycleActionStart | util.LifecycleActionDelete,
 		PreCreate: func(r *util.Runtime) error {
 			r.SetID(uuid.NewV4().String())
 			r.PidFile = tempPidFile
@@ -55,6 +56,13 @@ func main() {
 			}
 			return nil
 		},
+		PreDelete: func(r *util.Runtime) error {
+			util.WaitingForStatus(*r, util.LifecycleStatusRunning, time.Second*10, time.Second*1)
+			err = r.Kill("KILL")
+			// wait before the container been deleted
+			util.WaitingForStatus(*r, util.LifecycleStatusStopped, time.Second*10, time.Second*1)
+			return err
+		},
 	}
 
 	err = util.RuntimeLifecycleValidate(config)

validation/state/state.go

@@ -3,6 +3,7 @@ package main
 import (
 	"fmt"
 	"os/exec"
+	"time"
 
 	"github.com/mndrix/tap-go"
 	rspecs "github.com/opencontainers/runtime-spec/specs-go"
@@ -44,6 +45,8 @@ func main() {
 			},
 			PostCreate: func(r *util.Runtime) error {
 				_, err = r.State()
+				r.Kill("KILL")
+				util.WaitingForStatus(*r, util.LifecycleStatusStopped, time.Second*10, time.Second)
 				return err
 			},
 		}

validation/util/container.go

@@ -9,6 +9,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"time"
 
 	rspecs "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/opencontainers/runtime-tools/generate"
@@ -197,6 +198,9 @@ func (r *Runtime) Delete() (err error) {
 // forceRemoveBundle is true, after the deletion attempt regardless of
 // whether it was successful or not.
 func (r *Runtime) Clean(removeBundle bool, forceRemoveBundle bool) error {
+	r.Kill("KILL")
+	WaitingForStatus(*r, LifecycleStatusStopped, time.Second*10, time.Second/10)
+
 	err := r.Delete()
 
 	if removeBundle && (err == nil || forceRemoveBundle) {

validation/util/test.go

@@ -350,7 +350,8 @@ func RuntimeLifecycleValidate(config LifecycleConfig) error {
 				if _, err := r.State(); err != nil {
 					return
 				}
-				err := WaitingForStatus(r, LifecycleStatusCreated|LifecycleStatusStopped, time.Second*10, time.Second*1)
+				r.Kill("KILL")
+				err := WaitingForStatus(r, LifecycleStatusStopped, time.Second*10, time.Second*1)
 				if err == nil {
 					r.Delete()
 				} else {