Skip to content

fix: delete orphans containerd task in namespace #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zwtop merged 1 commit into from
Jan 21, 2025
Merged

fix: delete orphans containerd task in namespace #47

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions client/runtime_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"context"
"errors"
"fmt"
"path/filepath"
"regexp"
"time"

Expand Down Expand Up @@ -64,7 +65,8 @@ func (r *runtime) newTask(ctx context.Context, container containerd.Container, c
// task already exists return "unknown" before containerd v1.6.0, see more: https://github.com/containerd/containerd/pull/6079
errorIsTaskExists := errdefs.IsAlreadyExists(err) ||
errors.Is(err, errdefs.ErrUnknown) && regexp.MustCompile(`task .* already exists: unknown$`).MatchString(err.Error()) ||
errors.Is(err, errdefs.ErrUnknown) && regexp.MustCompile(`container with id exists: .*: unknown$`).MatchString(err.Error())
errors.Is(err, errdefs.ErrUnknown) && regexp.MustCompile(`container with id exists: .*: unknown$`).MatchString(err.Error()) ||
errors.Is(err, errdefs.ErrUnknown) && regexp.MustCompile(`mkdir /run/containerd/io\.containerd\.runtime\.v2\.task/.*: file exists: unknown$`).MatchString(err.Error())
if !errorIsTaskExists {
return nil, err
}
Expand All @@ -76,7 +78,10 @@ func (r *runtime) newTask(ctx context.Context, container containerd.Container, c
_ = r.execHostCommand(ctx, "remove-task-shim"+uuid.New().String(), "sh", "-c", killCommand)

// delete orphans runc container in namespace
_ = r.execHostCommand(ctx, "remove-runc-container"+uuid.New().String(), "runc", "--root=/run/containerd/runc/"+r.namespace, "delete", "-f", container.ID())
_ = r.execHostCommand(ctx, "remove-runc-container"+uuid.New().String(), "runc", "--root="+filepath.Join("/run/containerd/runc/", r.namespace), "delete", "-f", container.ID())

// delete orphans containerd task in namespace
_ = r.execHostCommand(ctx, "remove-task-path"+uuid.New().String(), "rm", "-rf", filepath.Join("/run/containerd/io.containerd.runtime.v2.task/", r.namespace, container.ID()))

// to prevent indefinitely waiting, set default timeout to 1min. If ctx
// has an earlier deadline, the timeout will be overridden
Expand Down
Loading