Merge pull request #29337 from anusha-ragunathan/unmount_enable_err

When plugin enable fails, unmount PropagatedMount.
Upstream-commit: e9076c0f00898e7af05e667d65ecb84a6e15d9c8
Component: engine
This commit is contained in:
Victor Vieux
2016-12-12 16:02:16 -08:00
committed by GitHub

View File

@ -41,6 +41,11 @@ func (pm *Manager) enable(p *v2.Plugin, c *controller, force bool) error {
}
if err := pm.containerdClient.Create(p.GetID(), "", "", specs.Spec(*spec), attachToLog(p.GetID())); err != nil {
if p.PropagatedMount != "" {
if err := mount.Unmount(p.PropagatedMount); err != nil {
logrus.Warnf("Could not unmount %s: %v", p.PropagatedMount, err)
}
}
return err
}