github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Support SIGRTMIN+n signals

Browse Source 
systemd uses SIGRTMIN+n signals, but containerd didn't support the signals
since Go's sys/unix doesn't support them.

This change introduces SIGRTMIN+n handling by utilizing moby/sys/signal.

Fixes #5402.

https://www.freedesktop.org/software/systemd/man/systemd.html#Signals

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
This commit is contained in:
Kazuyoshi Kato
2021-07-06 14:08:42 -07:00
parent 3b7a3d599b
commit 1d3d08026d
128 changed files with 4053 additions and 12240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/ctr/commands/tasks/kill.go
View File

@@ -19,6 +19,7 @@ package tasks
import (
"github.com/containerd/containerd"
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/moby/sys/signal"
"github.com/pkg/errors"
"github.com/urfave/cli"
)
@@ -49,7 +50,7 @@ var killCommand = cli.Command{
if id == "" {
return errors.New("container id must be provided")
}
signal, err := containerd.ParseSignal(defaultSignal)
sig, err := signal.ParseSignal(defaultSignal)
if err != nil {
return err
}
@@ -77,12 +78,12 @@ var killCommand = cli.Command{
return err
}
if context.String("signal") != "" {
signal, err = containerd.ParseSignal(context.String("signal"))
sig, err = signal.ParseSignal(context.String("signal"))
if err != nil {
return err
}
} else {
signal, err = containerd.GetStopSignal(ctx, container, signal)
sig, err = containerd.GetStopSignal(ctx, container, sig)
if err != nil {
return err
}
@@ -91,6 +92,6 @@ var killCommand = cli.Command{
if err != nil {
return err
}
return task.Kill(ctx, signal, opts...)
return task.Kill(ctx, sig, opts...)
},
}