opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-15 03:02:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Let containers/storage keep track of mounts

Browse Source 
Currently we unmount storage that is still in use.
We should not be unmounting storeage that we mounted
via a different command or by podman mount. This
change relies on containers/storage to umount keep track of
how many times the storage was mounted before really unmounting
it from the system.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh
2018-07-19 16:59:42 -04:00
parent 98703eb204
commit 85db3f09bf
4 changed files with 53 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libpod/container_api.go
View File

@ -437,11 +437,7 @@ func (c *Container) Mount() (string, error) {
}
}
if err := c.mountStorage(); err != nil {
return "", err
}
return c.state.Mountpoint, nil
return c.mount()
}
// Unmount unmounts a container's filesystem on the host
@ -456,15 +452,24 @@ func (c *Container) Unmount() error {
}
if c.state.State == ContainerStateRunning || c.state.State == ContainerStatePaused {
return errors.Wrapf(ErrCtrStateInvalid, "cannot remove storage for container %s as it is running or paused", c.ID())
return errors.Wrapf(ErrCtrStateInvalid, "cannot unmount storage for container %s as it is running or paused", c.ID())
}
// Check if we have active exec sessions
if len(c.state.ExecSessions) != 0 {
return errors.Wrapf(ErrCtrStateInvalid, "container %s has active exec sessions, refusing to clean up", c.ID())
return errors.Wrapf(ErrCtrStateInvalid, "container %s has active exec sessions, refusing to unmount", c.ID())
}
return c.cleanupStorage()
if c.state.Mounted {
mounted, err := c.runtime.storageService.MountedContainerImage(c.ID())
if err != nil {
return errors.Wrapf(err, "can't determine how many times %s is mounted, refusing to unmount", c.ID())
}
if mounted == 1 {
return errors.Wrapf(err, "can't unmount %s last mount, it is still in use", c.ID())
}
}
return c.unmount()
}
// Pause pauses a container