Graceful stop app and daprd

Signed-off-by: Albert Callarisa <[email protected]>

Author: acroca

cmd/run.go

@@ -819,24 +819,25 @@ func stopDaprdAndAppProcesses(runState *runExec.RunExec) bool {
 
 	exitWithError := false
 
-	daprErr := runState.DaprCMD.CommandErr
+	appErr := runState.AppCMD.CommandErr
 
-	if daprErr != nil {
+	if appErr != nil {
 		exitWithError = true
-		print.StatusEvent(runState.DaprCMD.ErrorWriter, print.LogFailure, "Error exiting Dapr: %s", daprErr)
-	} else if runState.DaprCMD.Command.ProcessState == nil || !runState.DaprCMD.Command.ProcessState.Exited() {
-		err = killDaprdProcess(runState)
+		print.StatusEvent(runState.AppCMD.ErrorWriter, print.LogFailure, "Error exiting App: %s", appErr)
+	} else if runState.AppCMD.Command != nil && (runState.AppCMD.Command.ProcessState == nil || !runState.AppCMD.Command.ProcessState.Exited()) {
+		err = stopOrKillAppProcess(runState)
 		if err != nil {
 			exitWithError = true
 		}
 	}
-	appErr := runState.AppCMD.CommandErr
 
-	if appErr != nil {
+	daprErr := runState.DaprCMD.CommandErr
+
+	if daprErr != nil {
 		exitWithError = true
-		print.StatusEvent(runState.AppCMD.ErrorWriter, print.LogFailure, "Error exiting App: %s", appErr)
-	} else if runState.AppCMD.Command != nil && (runState.AppCMD.Command.ProcessState == nil || !runState.AppCMD.Command.ProcessState.Exited()) {
-		err = killAppProcess(runState)
+		print.StatusEvent(runState.DaprCMD.ErrorWriter, print.LogFailure, "Error exiting Dapr: %s", daprErr)
+	} else if runState.DaprCMD.Command.ProcessState == nil || !runState.DaprCMD.Command.ProcessState.Exited() {
+		err = killDaprdProcess(runState)
 		if err != nil {
 			exitWithError = true
 		}
@@ -992,7 +993,7 @@ func startDaprdProcess(runConfig *standalone.RunConfig, runE *runExec.RunExec,
 
 // killDaprdProcess is used to kill the Daprd process and return error on failure.
 func killDaprdProcess(runE *runExec.RunExec) error {
-	err := runE.DaprCMD.Command.Process.Kill()
+	err := runE.DaprCMD.StopGracefully()
 	if err != nil {
 		print.StatusEvent(runE.DaprCMD.ErrorWriter, print.LogFailure, "Error exiting Dapr: %s", err)
 		return err
@@ -1001,12 +1002,12 @@ func killDaprdProcess(runE *runExec.RunExec) error {
 	return nil
 }
 
-// killAppProcess is used to kill the App process and return error on failure.
-func killAppProcess(runE *runExec.RunExec) error {
+// stopOrKillAppProcess is used to kill the App process and return error on failure.
+func stopOrKillAppProcess(runE *runExec.RunExec) error {
 	if runE.AppCMD.Command == nil {
 		return nil
 	}
-	err := runE.AppCMD.Command.Process.Kill()
+	err := runE.AppCMD.StopGracefully()
 	if err != nil {
 		print.StatusEvent(runE.DaprCMD.ErrorWriter, print.LogFailure, "Error exiting App: %s", err)
 		return err

pkg/runexec/runexec.go

@@ -15,9 +15,12 @@ package runexec
 
 import (
 	"errors"
+	"fmt"
 	"io"
 	"os"
 	"os/exec"
+	"syscall"
+	"time"
 
 	"github.com/dapr/cli/pkg/runfileconfig"
 	"github.com/dapr/cli/pkg/standalone"
@@ -105,6 +108,31 @@ func (c *CmdProcess) SetStderr() error {
 	return nil
 }
 
+func (c *CmdProcess) StopGracefully() error {
+	waitChan := make(chan struct{}, 1)
+	go func() {
+		c.Command.Process.Wait()
+		close(waitChan)
+	}()
+
+	err := syscall.Kill(c.Command.Process.Pid, syscall.SIGTERM)
+	if err != nil {
+		return fmt.Errorf("error sending SIGTERM to App: %w", err)
+	}
+	select {
+	case <-waitChan:
+		return nil
+	case <-time.After(10 * time.Second):
+	}
+	fmt.Println("ALBERT: Sending SIGKILL to process")
+	err = c.Command.Process.Kill()
+	if err != nil {
+		return fmt.Errorf("error sending SIGKILL to App: %w", err)
+	}
+	return nil
+
+}
+
 func NewOutput(config *standalone.RunConfig) (*RunOutput, error) {
 	// set default values from RunConfig struct's tag.
 	config.SetDefaultFromSchema()

tests/e2e/spawn/spawn.go

@@ -80,6 +80,8 @@ func Command(command string, arguments ...string) (string, error) {
 // CommandExecWithContext runs a command with its arguments, kills the command after context is done
 // and returns the combined stdout, stderr or the error.
 func CommandExecWithContext(ctx context.Context, command string, arguments ...string) (string, error) {
+	ctx, cancel := context.WithTimeout(ctx, 30*time.Second)
+	defer cancel()
 	cmd := exec.CommandContext(ctx, command, arguments...)
 	var b bytes.Buffer
 	cmd.Stdout = &b
@@ -101,17 +103,7 @@ func CommandExecWithContext(ctx context.Context, command string, arguments ...st
 			return
 		case <-time.After(20 * time.Second):
 			if cmd.ProcessState == nil || !cmd.ProcessState.Exited() {
-				syscall.Kill(-cmd.Process.Pid, syscall.SIGTERM)
-			}
-		}
-		select {
-		case <-waitFinished:
-			return
-		case <-ctx.Done():
-			return
-		case <-time.After(10 * time.Second):
-			if cmd.ProcessState == nil || !cmd.ProcessState.Exited() {
-				syscall.Kill(-cmd.Process.Pid, syscall.SIGKILL)
+				cmd.Process.Signal(syscall.SIGTERM)
 			}
 		}
 	}()