feat: Ignore SIGURG in argoexec emissary. Fixes #10129 (#10141)

Signed-off-by: Kazuki Suda <[email protected]>
argoproj · Dec 1, 2022 · 6166464 · 6166464
1 parent 6673cfb
commit 6166464
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/cmd/argoexec/commands/emissary.go b/cmd/argoexec/commands/emissary.go
@@ -131,9 +131,13 @@ func NewEmissaryCommand() *cobra.Command {
 
 				go func() {
 					for s := range signals {
-						if !osspecific.IsSIGCHLD(s) {
-							_ = osspecific.Kill(command.Process.Pid, s.(syscall.Signal))
+						if osspecific.CanIgnoreSignal(s) {
+							logger.Debugf("ignore signal %s", s)
+							continue
 						}
+
+						logger.Debugf("forwarding signal %s", s)
+						_ = osspecific.Kill(command.Process.Pid, s.(syscall.Signal))
 					}
 				}()
 				pid := command.Process.Pid

diff --git a/workflow/executor/os-specific/signal_darwin.go b/workflow/executor/os-specific/signal_darwin.go
@@ -8,7 +8,9 @@ import (
 	"github.com/argoproj/argo-workflows/v3/util/errors"
 )
 
-func IsSIGCHLD(s os.Signal) bool { return s == syscall.SIGCHLD }
+func CanIgnoreSignal(s os.Signal) bool {
+	return s == syscall.SIGCHLD || s == syscall.SIGURG
+}
 
 func Kill(pid int, s syscall.Signal) error {
 	pgid, err := syscall.Getpgid(pid)

diff --git a/workflow/executor/os-specific/signal_windows.go b/workflow/executor/os-specific/signal_windows.go
@@ -6,8 +6,8 @@ import (
 	"syscall"
 )
 
-func IsSIGCHLD(s os.Signal) bool {
-	return false // this does not exist on windows
+func CanIgnoreSignal(s os.Signal) bool {
+	return false
 }
 
 func Kill(pid int, s syscall.Signal) error {