refactor: cri exec

pkg/cri/api.go

@@ -136,8 +136,9 @@ type (
 		WorkingDir string   `json:"workingDir"`
 		Input      io.Reader
 		// User is the user passed to docker exec, defaults to 'root'
-		User   string
-		FixOut bool
+		User                 string
+		FixOut               bool
+		NoWrapCmdWithTimeout bool
 	}
 )
 

pkg/cri/criutils/zombies.go

@@ -15,7 +15,8 @@ import (
 
 func CountZombies(i cri.Interface, ctx context.Context, c *cri.Container) (int, error) {
 	r, err := i.Exec(ctx, c, cri.ExecRequest{
-		Cmd: []string{core.HelperToolPath, "countZombies"},
+		Cmd:                  []string{core.HelperToolPath, "countZombies"},
+		NoWrapCmdWithTimeout: true,
 	})
 	if err != nil {
 		return 0, err

pkg/cri/impl/default_cri.go

@@ -268,6 +268,11 @@ func (e *defaultCri) Exec(ctx context.Context, c *cri.Container, req cri.ExecReq
 		return invalidResult, errContainerIsNil
 	}
 
+	if !req.NoWrapCmdWithTimeout {
+		req.Cmd = wrapTimeout(c, req.Cmd)
+	}
+	req.Env = wrapEnv(req.Env)
+
 	begin := time.Now()
 	defer func() {
 		cost := time.Now().Sub(begin)
@@ -635,11 +640,11 @@ func (e *defaultCri) buildCriContainer(criPod *cri.Pod, dc *cri.EngineDetailCont
 			alreadyExists := false
 			copyCount := 0
 
-			if err := e.ensureHelperCopied(ctx, criContainer, core.HelperToolLocalPath, core.HelperToolPath); err == nil {
+			if err := e.ensureHelperCopied(ctx, criContainer, core.BusyboxLocalPath, core.BusyboxPath); err == nil {
 				copyCount++
 			}
 
-			if err := e.ensureHelperCopied(ctx, criContainer, core.BusyboxLocalPath, core.BusyboxPath); err == nil {
+			if err := e.ensureHelperCopied(ctx, criContainer, core.HelperToolLocalPath, core.HelperToolPath); err == nil {
 				copyCount++
 			}
 
@@ -1080,7 +1085,7 @@ func (e *defaultCri) updateZombieCheck(c *cri.Container) {
 		return
 	}
 
-	if _, err := e.Exec(ctx, c, cri.ExecRequest{Cmd: []string{core.BusyboxPath, "timeout", "1", "true"}}); err != nil {
+	if _, err := e.Exec(ctx, c, cri.ExecRequest{Cmd: []string{core.BusyboxPath, "timeout", "1", "true"}, NoWrapCmdWithTimeout: true}); err != nil {
 		logger.Errorz("check timeout error", zap.String("cid", c.ShortID()), zap.Error(err))
 		return
 	}

pkg/cri/impl/engine/containerd_engine.go

@@ -284,13 +284,13 @@ func (e *ContainerdContainerEngine) Exec(ctx context.Context, c *cri.Container,
 
 	pspec := spec.Process
 	pspec.Terminal = false
-	pspec.Args = wrapTimeout(c, req.Cmd)
+	pspec.Args = req.Cmd
 	if req.WorkingDir != "" {
 		pspec.Cwd = req.WorkingDir
 	}
 
 	// Append user specified env
-	pspec.Env = wrapEnv(append(pspec.Env, req.Env...))
+	pspec.Env = append(pspec.Env, req.Env...)
 
 	task, err := container.Task(ctx, nil)
 	if err != nil {
@@ -425,13 +425,13 @@ func (e *ContainerdContainerEngine) ExecAsync(ctx context.Context, c *cri.Contai
 
 	pspec := spec.Process
 	pspec.Terminal = false
-	pspec.Args = wrapTimeout(c, req.Cmd)
+	pspec.Args = req.Cmd
 	if req.WorkingDir != "" {
 		pspec.Cwd = req.WorkingDir
 	}
 
 	// Append user specified env
-	pspec.Env = wrapEnv(append(pspec.Env, req.Env...))
+	pspec.Env = req.Env
 
 	task, err := container.Task(ctx, nil)
 	if err != nil {

pkg/cri/impl/engine/docker_engine.go

@@ -132,9 +132,9 @@ func (e *DockerContainerEngine) Exec(ctx context.Context, c *cri.Container, req
 		AttachStdout: true,
 		Detach:       false,
 		DetachKeys:   "",
-		Env:          wrapEnv(req.Env),
+		Env:          req.Env,
 		WorkingDir:   req.WorkingDir,
-		Cmd:          wrapTimeout(c, req.Cmd),
+		Cmd:          req.Cmd,
 	})
 	if err != nil {
 		return invalidResult, err
@@ -240,9 +240,9 @@ func (e *DockerContainerEngine) ExecAsync(ctx context.Context, c *cri.Container,
 		AttachStdout: true,
 		Detach:       false,
 		DetachKeys:   "",
-		Env:          wrapEnv(req.Env),
+		Env:          req.Env,
 		WorkingDir:   req.WorkingDir,
-		Cmd:          wrapTimeout(c, hackedCmd),
+		Cmd:          hackedCmd,
 	})
 	if err != nil {
 		return invalidResult, err

pkg/cri/impl/engine/utils.go → pkg/cri/impl/wrap.go

@@ -1,8 +1,4 @@
-/*
- * Copyright 2022 Holoinsight Project Authors. Licensed under Apache-2.0.
- */
-
-package engine
+package impl
 
 import (
 	"github.com/spf13/cast"
@@ -29,9 +25,9 @@ func wrapTimeout(c *cri.Container, cmd []string) []string {
 	// Different busybox versions have different timeout command formats
 	// In alpined based container, timeout will generate zombie processes
 	// timeout -s KILL <seconds> cmd...
-	// return append([]string{"timeout", "-s", "KILL", timeout}, cmd...)
+	// return append([]string{"timeout", "-s", "SIGKILL", timeout}, cmd...)
 	if c.Pid1CanRecycleZombieProcesses {
-		return append([]string{core.BusyboxPath, "timeout", "-s", "KILL", timeout}, cmd...)
+		return append([]string{core.BusyboxPath, "timeout", "-s", "SIGKILL", timeout}, cmd...)
 	}
 	return cmd
 }