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

container: Fixed a bunch of race conditions by getting rid of lxc-wait.

Browse source
This commit is contained in:
Andrea Luzzardi 2013-01-25 15:36:47 -08:00
parent 1df9819b25
commit f4e25694c1
1 changed files with 12 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
container.go
View file

@ -121,18 +121,6 @@ func (container *Container) Start() error {
container.State.setRunning(container.cmd.Process.Pid) container.State.setRunning(container.cmd.Process.Pid)
container.save() container.save()
go container.monitor() go container.monitor()
if err := exec.Command("/usr/bin/lxc-wait", "-n", container.Id, "-s", "RUNNING|STOPPED").Run(); err != nil {
// lxc-wait might return an error if by the time we call it,
// the container we just started is already STOPPED.
// This is a rare race condition that happens for short living programs.
//
// A workaround is to discard lxc-wait errors if the container is not
// running anymore.
if !container.State.Running {
return nil
}
return errors.New("Container failed to start")
}
return nil return nil
} }
@ -188,20 +176,11 @@ func (container *Container) monitor() {
} }
func (container *Container) kill() error { func (container *Container) kill() error {
// This will cause the main container process to receive a SIGKILL if err := container.cmd.Process.Kill(); err != nil {
if err := exec.Command("/usr/bin/lxc-stop", "-n", container.Id).Run(); err != nil {
log.Printf("Failed to lxc-stop %v", container.Id)
return err return err
} }
// Wait for the container to be actually stopped // Wait for the container to be actually stopped
container.Wait() container.Wait()
// Make sure the underlying LXC thinks it's stopped too
// LXC Issue: lxc-wait MIGHT say that the container doesn't exist
// That's probably because it was destroyed and it cannot find it anymore
// We are going to ignore lxc-wait's error
exec.Command("/usr/bin/lxc-wait", "-n", container.Id, "-s", "STOPPED").Run()
return nil return nil
} }
@ -218,18 +197,20 @@ func (container *Container) Stop() error {
} }
// 1. Send a SIGTERM // 1. Send a SIGTERM
if err := exec.Command("/usr/bin/lxc-kill", "-n", container.Id, "15").Run(); err != nil { if output, err := exec.Command("/usr/bin/lxc-kill", "-n", container.Id, "15").CombinedOutput(); err != nil {
return err log.Printf(string(output))
log.Printf("Failed to send SIGTERM to the process, force killing")
if err := container.Kill(); err != nil {
return err
}
} }
// 2. Wait for the process to exit on its own // 2. Wait for the process to exit on its own
if err := container.WaitTimeout(10 * time.Second); err != nil { if err := container.WaitTimeout(10 * time.Second); err != nil {
log.Printf("Container %v failed to exit within 10 seconds of SIGTERM", container.Id) log.Printf("Container %v failed to exit within 10 seconds of SIGTERM - using the force", container.Id)
} if err := container.Kill(); err != nil {
return err
// 3. Force kill }
if err := container.kill(); err != nil {
return err
} }
return nil return nil
} }
@ -245,6 +226,7 @@ func (container *Container) Restart() error {
} }
func (container *Container) Wait() { func (container *Container) Wait() {
for container.State.Running { for container.State.Running {
container.State.wait() container.State.wait()
} }