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

Fix locking interaction in batched Exec() on container

Browse Source 
Signed-off-by: Matthew Heon <mheon@redhat.com>

Closes: #610
Approved by: giuseppe
This commit is contained in:
Matthew Heon
2018-04-12 12:18:02 -04:00
committed by Atomic Bot
parent ec90d6f4cc
commit 4b25039cf4
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libpod/container_api.go
View File

@ -376,14 +376,18 @@ func (c *Container) Exec(tty, privileged bool, env, cmd []string, user string) e
logrus.Debugf("Successfully started exec session %s in container %s", sessionID, c.ID())
// Unlock so other processes can use the container
c.lock.Unlock()
locked = false
if !c.locked {
c.lock.Unlock()
locked = false
}
waitErr := execCmd.Wait()
// Lock again
locked = true
c.lock.Lock()
if !c.locked {
locked = true
c.lock.Lock()
}
// Sync the container again to pick up changes in state
if err := c.syncContainer(); err != nil {