When plugin enable fails, unmount PropagatedMount.

anusha-ragunathan · vieux · commit 1a86cbb0312e · 2016-12-12T16:17:19.000-08:00
Signed-off-by: Anusha Ragunathan <anusha@docker.com> (cherry picked from commit cef443b) Signed-off-by: Victor Vieux <vieux@docker.com>
diff --git a/plugin/manager_linux.go b/plugin/manager_linux.go
@@ -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
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,11 @@ func (pm Manager) enable(p v2.Plugin, c *controller, force bool) error {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`if err := pm.containerdClient.Create(p.GetID(), "", "", specs.Spec(*spec), attachToLog(p.GetID())); err != nil {`
	`44`	`+ if p.PropagatedMount != "" {`
	`45`	`+ if err := mount.Unmount(p.PropagatedMount); err != nil {`
	`46`	`+ logrus.Warnf("Could not unmount %s: %v", p.PropagatedMount, err)`
	`47`	`+ }`
	`48`	`+ }`
`44`	`49`	`return err`
`45`	`50`	`}`
`46`	`51`