Merge pull request #2127 from devimc/topic/virtcontainers/rollbackUnm…

…ountHostMounts virtcontainers: unmount host mounts if container can't be created
kata-containers · Oct 14, 2019 · 7d484df · 7d484df
2 parents a1cd0f8 + eca7bd2
commit 7d484df
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/virtcontainers/container.go b/virtcontainers/container.go
@@ -857,6 +857,12 @@ func (c *Container) rollbackFailingContainerCreation() {
 	if err := c.removeDrive(); err != nil {
 		c.Logger().WithError(err).Error("rollback failed removeDrive()")
 	}
+	if err := c.unmountHostMounts(); err != nil {
+		c.Logger().WithError(err).Error("rollback failed unmountHostMounts()")
+	}
+	if err := bindUnmountContainerRootfs(c.ctx, kataHostSharedDir(), c.sandbox.id, c.id); err != nil {
+		c.Logger().WithError(err).Error("rollback failed bindUnmountContainerRootfs()")
+	}
 }
 
 func (c *Container) checkBlockDeviceSupport() bool {