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

Merge pull request #6571 from fuweid/fix-6402-for-runc.v1

Browse Source
This commit is contained in:
Fu Wei 2022-02-21 13:39:15 +08:00 committed by GitHub
commit d128c3767b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
runtime/v2/runc/v1/service.go
View File

@ -259,9 +259,16 @@ func (s *service) Cleanup(ctx context.Context) (*taskAPI.DeleteResponse, error)
if err := mount.UnmountAll(filepath.Join(path, "rootfs"), 0); err != nil { if err := mount.UnmountAll(filepath.Join(path, "rootfs"), 0); err != nil {
logrus.WithError(err).Warn("failed to cleanup rootfs mount") logrus.WithError(err).Warn("failed to cleanup rootfs mount")
} }
pid, err := runcC.ReadPidFile(filepath.Join(path, process.InitPidFile))
if err != nil {
logrus.WithError(err).Warn("failed to read init pid file")
}
return &taskAPI.DeleteResponse{ return &taskAPI.DeleteResponse{
ExitedAt: time.Now(), ExitedAt: time.Now(),
ExitStatus: 128 + uint32(unix.SIGKILL), ExitStatus: 128 + uint32(unix.SIGKILL),
Pid: uint32(pid),
}, nil }, nil
} }