fix: timeout is not respected

Author: cjc7373

pkg/kbagent/service/command.go

@@ -28,6 +28,7 @@ import (
 	"os"
 	"os/exec"
 	"strings"
+	"syscall"
 	"time"
 
 	"github.com/apecloud/kubeblocks/pkg/kbagent/proto"
@@ -144,6 +145,11 @@ func runCommandX(ctx context.Context, action *proto.ExecAction, parameters map[s
 	cmd.Stdin = stdinReader
 	cmd.Stdout = stdoutWriter
 	cmd.Stderr = stderrWriter
+	cmd.WaitDelay = time.Second * 1
+	// gracefully terminate, go will kill it after waitDelay
+	cmd.Cancel = func() error {
+		return cmd.Process.Signal(syscall.SIGTERM)
+	}
 
 	errChan := make(chan error, 1)
 	go func() {

pkg/kbagent/service/command_test.go

@@ -271,22 +271,20 @@ var _ = Describe("command", func() {
 			action := &proto.ExecAction{
 				Commands: []string{"/bin/bash", "-c", "command-not-found"},
 			}
-			output, err := runCommand(ctx, action, nil, nil)
+			_, err := runCommand(ctx, action, nil, nil)
 			Expect(err).ShouldNot(BeNil())
 			Expect(errors.Is(err, proto.ErrFailed)).Should(BeTrue())
 			Expect(err.Error()).Should(ContainSubstring("command not found"))
-			Expect(output).Should(BeNil())
 		})
 
 		It("timeout", func() {
 			action := &proto.ExecAction{
 				Commands: []string{"/bin/bash", "-c", "sleep 60"},
 			}
 			timeout := int32(1)
-			output, err := runCommand(ctx, action, nil, &timeout)
+			_, err := runCommand(ctx, action, nil, &timeout)
 			Expect(err).ShouldNot(BeNil())
 			Expect(errors.Is(err, proto.ErrTimedOut)).Should(BeTrue())
-			Expect(output).Should(BeNil())
 		})
 	})
 })