2abaf6e964
We were not checking the error value of `Kill` leading to deadlock if the process didn't exist. Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
55 lines
1.5 KiB
Go
55 lines
1.5 KiB
Go
package containerd
|
|
|
|
import (
|
|
"context"
|
|
"syscall"
|
|
|
|
"github.com/containerd/containerd/errdefs"
|
|
"github.com/containerd/containerd/linux/runcopts"
|
|
"github.com/containerd/containerd/mount"
|
|
)
|
|
|
|
// NewTaskOpts allows the caller to set options on a new task
|
|
type NewTaskOpts func(context.Context, *Client, *TaskInfo) error
|
|
|
|
// WithRootFS allows a task to be created without a snapshot being allocated to its container
|
|
func WithRootFS(mounts []mount.Mount) NewTaskOpts {
|
|
return func(ctx context.Context, c *Client, ti *TaskInfo) error {
|
|
ti.RootFS = mounts
|
|
return nil
|
|
}
|
|
}
|
|
|
|
// WithExit causes the task to exit after a successful checkpoint
|
|
func WithExit(r *CheckpointTaskInfo) error {
|
|
r.Options = &runcopts.CheckpointOptions{
|
|
Exit: true,
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// ProcessDeleteOpts allows the caller to set options for the deletion of a task
|
|
type ProcessDeleteOpts func(context.Context, Process) error
|
|
|
|
// WithProcessKill will forcefully kill and delete a process
|
|
func WithProcessKill(ctx context.Context, p Process) error {
|
|
s := make(chan struct{}, 1)
|
|
ctx, cancel := context.WithCancel(ctx)
|
|
defer cancel()
|
|
// ignore errors to wait and kill as we are forcefully killing
|
|
// the process and don't care about the exit status
|
|
go func() {
|
|
p.Wait(ctx)
|
|
close(s)
|
|
}()
|
|
if err := p.Kill(ctx, syscall.SIGKILL); err != nil {
|
|
if errdefs.IsFailedPrecondition(err) || errdefs.IsNotFound(err) {
|
|
return nil
|
|
}
|
|
return err
|
|
}
|
|
// wait for the process to fully stop before letting the rest of the deletion complete
|
|
<-s
|
|
return nil
|
|
}
|