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

Fix potential race condition in initializing libpod

Browse Source 
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
This commit is contained in:
Matthew Heon
2017-12-04 14:44:03 -05:00
parent ae5aac50aa
commit 92bc448624
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libpod/container.go
View File

@ -413,7 +413,7 @@ func (c *Container) refresh() error {
defer c.lock.Unlock() defer c.lock.Unlock()
if !c.valid { if !c.valid {
return errors.Wrapf(ErrCtrRemoved, "container %s has been removed from the state", c.ID()) return errors.Wrapf(ErrCtrRemoved, "container %s is not valid - may have been removed", c.ID())
} }
// We need to get the container's temporary directory from c/storage // We need to get the container's temporary directory from c/storage

15
libpod/runtime.go
View File

@ -175,7 +175,19 @@ func NewRuntime(options ...RuntimeOption) (runtime *Runtime, err error) {
// We now need to see if the system has restarted // We now need to see if the system has restarted
// We check for the presence of a file in our tmp directory to verify this // We check for the presence of a file in our tmp directory to verify this
// This check must be locked to prevent races
runtimeAliveLock := filepath.Join(runtime.config.TmpDir, "alive.lck")
runtimeAliveFile := filepath.Join(runtime.config.TmpDir, "alive") runtimeAliveFile := filepath.Join(runtime.config.TmpDir, "alive")
aliveLock, err := storage.GetLockfile(runtimeAliveLock)
if err != nil {
return nil, errors.Wrapf(err, "error acquiring runtime init lock")
}
// Acquire the lock and hold it until we return
// This ensures that no two processes will be in runtime.refresh at once
// TODO: we can't close the FD in this lock, so we should keep it around
// and use it to lock important operations
aliveLock.Lock()
defer aliveLock.Unlock()
_, err = os.Stat(runtimeAliveFile) _, err = os.Stat(runtimeAliveFile)
if err != nil { if err != nil {
// If the file doesn't exist, we need to refresh the state // If the file doesn't exist, we need to refresh the state
@ -260,9 +272,6 @@ func (r *Runtime) Shutdown(force bool) error {
// Reconfigures the runtime after a reboot // Reconfigures the runtime after a reboot
// Refreshes the state, recreating temporary files // Refreshes the state, recreating temporary files
// Does not check validity as the runtime is not valid until after this has run // Does not check validity as the runtime is not valid until after this has run
// TODO: there's a potential race here, where multiple libpods could be in this
// function before the runtime ready file is created
// This probably doesn't matter as the actual container operations are locked
func (r *Runtime) refresh(alivePath string) error { func (r *Runtime) refresh(alivePath string) error {
// We need to refresh the state of all containers // We need to refresh the state of all containers
ctrs, err := r.state.AllContainers() ctrs, err := r.state.AllContainers()