kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Fix race in set running

Browse source 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
This commit is contained in:
Michael Crosby 2014-01-10 17:25:32 -08:00
parent 381d593d04
commit 77936ba1a1
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
container.go
View file

@ -760,6 +760,7 @@ func (container *Container) Start() (err error) {
return err
}
container.waitLock = make(chan struct{})
container.State.SetRunning(0)
go container.monitor()
if container.Config.Tty {
@ -771,7 +772,9 @@ func (container *Container) Start() (err error) {
return err
}
container.State.SetRunning(container.process.Pid())
// TODO: @crosbymichael @creack
// find a way to update this
// container.State.SetRunning(container.process.Pid())
container.ToDisk()
return nil
}
@ -1176,6 +1179,8 @@ func (container *Container) monitor() {
exitCode := container.process.GetExitCode()
container.State.SetStopped(exitCode)
close(container.waitLock)
if err := container.ToDisk(); err != nil {
// FIXME: there is a race condition here which causes this to fail during the unit tests.
// If another goroutine was waiting for Wait() to return before removing the container's root
@ -1185,7 +1190,6 @@ func (container *Container) monitor() {
// FIXME: why are we serializing running state to disk in the first place?
//log.Printf("%s: Failed to dump configuration to the disk: %s", container.ID, err)
}
close(container.waitLock)
}
func (container *Container) cleanup() {

1
execdriver/lxc/driver.go
View file

@ -123,7 +123,6 @@ func (d *driver) Wait(id string, duration time.Duration) error {
func (d *driver) kill(c *execdriver.Process, sig int) error {
output, err := exec.Command("lxc-kill", "-n", c.ID, strconv.Itoa(sig)).CombinedOutput()
if err != nil {
fmt.Printf("--->%s\n", output)
return fmt.Errorf("Err: %s Output: %s", err, output)
}
return nil