zishuo/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2025-10-18 13:30:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3217 from kolyshkin/delete-paused

Browse Source 
runc delete -f: fix for cg v1 + paused container
This commit is contained in:
Kir Kolyshkin
2021-09-20 10:51:40 -07:00
committed by GitHub
parent 206c16a7bf 6806b2c1c4
commit 03244ef2cf
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libcontainer/container_linux.go
View File

@@ -393,6 +393,14 @@ func (c *linuxContainer) Signal(s os.Signal, all bool) error {
if err := c.initProcess.signal(s); err != nil {
return fmt.Errorf("unable to signal init: %w", err)
}
if status == Paused {
// For cgroup v1, killing a process in a frozen cgroup
// does nothing until it's thawed. Only thaw the cgroup
// for SIGKILL.
if s, ok := s.(unix.Signal); ok && s == unix.SIGKILL {
_ = c.cgroupManager.Freeze(configs.Thawed)
}
}
return nil
}
return ErrNotRunning