Fix shim deadlock when joining an existing pid namespace (#290)

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
This commit is contained in:
Kenfe-Mickaël Laventure
2016-07-15 11:49:43 -07:00
committed by Michael Crosby
parent 3abb9fc411
commit 0ac3cd1be1
6 changed files with 21 additions and 8 deletions

View File

@@ -14,6 +14,7 @@ type DeleteTask struct {
Status int
PID string
NoEvent bool
Process runtime.Process
}
func (s *Supervisor) delete(t *DeleteTask) error {
@@ -22,6 +23,9 @@ func (s *Supervisor) delete(t *DeleteTask) error {
if err := s.deleteContainer(i.container); err != nil {
logrus.WithField("error", err).Error("containerd: deleting container")
}
if t.Process != nil {
t.Process.Wait()
}
if !t.NoEvent {
s.notifySubscribers(Event{
Type: StateExit,