0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use utils.Go to get error from monitor

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-13 16:41:35 -08:00
parent e765c67b47
commit c2b602b2ac
1 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
container.go
View file

@ -726,11 +726,14 @@ func (container *Container) Start() (err error) {
// We use a callback here instead of a goroutine and an chan for // We use a callback here instead of a goroutine and an chan for
// syncronization purposes // syncronization purposes
go container.monitor(callback) cErr := utils.Go(func() error { return container.monitor(callback) })
// Start should not return until the process is actually running // Start should not return until the process is actually running
<-waitLock select {
case <-waitLock:
case err := <-cErr:
return err
}
return nil return nil
} }
@ -1104,7 +1107,7 @@ func (container *Container) releaseNetwork() {
container.NetworkSettings = &NetworkSettings{} container.NetworkSettings = &NetworkSettings{}
} }
func (container *Container) monitor(callback execdriver.StartCallback) { func (container *Container) monitor(callback execdriver.StartCallback) error {
var ( var (
err error err error
exitCode int exitCode int
@ -1117,10 +1120,7 @@ func (container *Container) monitor(callback execdriver.StartCallback) {
exitCode, err = container.runtime.Run(container, callback) exitCode, err = container.runtime.Run(container, callback)
} }
if err != nil { //TODO: @crosbymichael @creack report error if err != nil {
// Since non-zero exit status and signal terminations will cause err to be non-nil,
// we have to actually discard it. Still, log it anyway, just in case.
utils.Debugf("monitor: cmd.Wait reported exit status %s for container %s", err, container.ID)
if container.runtime != nil && container.runtime.srv != nil { if container.runtime != nil && container.runtime.srv != nil {
container.runtime.srv.LogEvent("die", container.ID, container.runtime.repositories.ImageName(container.Image)) container.runtime.srv.LogEvent("die", container.ID, container.runtime.repositories.ImageName(container.Image))
} }
@ -1138,15 +1138,16 @@ func (container *Container) monitor(callback execdriver.StartCallback) {
close(container.waitLock) 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.
// 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
// If another goroutine was waiting for Wait() to return before removing the container's root // from the filesystem... At this point it may already have done so.
// from the filesystem... At this point it may already have done so. // This is because State.setStopped() has already been called, and has caused Wait()
// This is because State.setStopped() has already been called, and has caused Wait() // to return.
// to return. // FIXME: why are we serializing running state to disk in the first place?
// 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)
//log.Printf("%s: Failed to dump configuration to the disk: %s", container.ID, err) container.ToDisk()
}
return err
} }
func (container *Container) cleanup() { func (container *Container) cleanup() {