Merge pull request #13132 from LK4D4/fix_race_kill
Fix race between execdriver.Kill and execdriver.Run
This commit is contained in:
commit
a47fb5edca
|
@ -245,7 +245,9 @@ func waitInPIDHost(p *libcontainer.Process, c libcontainer.Container) func() (*o
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *driver) Kill(c *execdriver.Command, sig int) error {
|
func (d *driver) Kill(c *execdriver.Command, sig int) error {
|
||||||
|
d.Lock()
|
||||||
active := d.activeContainers[c.ID]
|
active := d.activeContainers[c.ID]
|
||||||
|
d.Unlock()
|
||||||
if active == nil {
|
if active == nil {
|
||||||
return fmt.Errorf("active container for %s does not exist", c.ID)
|
return fmt.Errorf("active container for %s does not exist", c.ID)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue