fix: unable to terminate process when cancelling a task

crawlab-team/crawlab#1248
crawlab-team · Jun 19, 2023 · c85c10a · c85c10a
1 parent 94f5d1d
commit c85c10a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/sys_exec/sys_exec.go b/sys_exec/sys_exec.go
@@ -47,14 +47,14 @@ func killProcessWithTimeout(p *process.Process, timeout time.Duration, killFunc
 		}
 		time.Sleep(1 * time.Second)
 	}
-	return forceKillProcess(p)
+	return killProcess(p, true)
 }
 
 func killProcessRecursive(p *process.Process, force bool) (err error) {
 	// children processes
 	cps, err := p.Children()
 	if err != nil {
-		return killProcess(p)
+		return killProcess(p, force)
 	}
 
 	// iterate children processes
@@ -67,15 +67,13 @@ func killProcessRecursive(p *process.Process, force bool) (err error) {
 	return nil
 }
 
-func killProcess(p *process.Process) (err error) {
-	if err := p.Terminate(); err != nil {
-		return trace.TraceError(err)
+func killProcess(p *process.Process, force bool) (err error) {
+	if force {
+		err = p.Kill()
+	} else {
+		err = p.Terminate()
 	}
-	return nil
-}
-
-func forceKillProcess(p *process.Process) (err error) {
-	if err := p.Kill(); err != nil {
+	if err != nil {
 		return trace.TraceError(err)
 	}
 	return nil

diff --git a/task/handler/runner.go b/task/handler/runner.go
@@ -167,7 +167,7 @@ func (r *Runner) Cancel() (err error) {
 	// kill process
 	opts := &sys_exec.KillProcessOptions{
 		Timeout: r.svc.GetCancelTimeout(),
-		Force:   false,
+		Force:   true,
 	}
 	if err := sys_exec.KillProcess(r.cmd, opts); err != nil {
 		return err