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

Ensure clean engine shutdown on startup errors

Browse source 
Previously on error either from the daemon or from the api it is just
exiting with exit status 1 but not performing a shutdown.
This can produce insconsistent state depending on where the error came
from.

This makes sure that before we exit on error that the engine gets fully
shutdown.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
This commit is contained in:
Brian Goff 2015-03-06 15:44:31 -05:00
parent 2a8a2d2428
commit 0e3f2f2ac0
2 changed files with 33 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

17
daemon/daemon.go
View file

@ -1002,14 +1002,6 @@ func NewDaemonFromDirectory(config *Config, eng *engine.Engine) (*Daemon, error)
trustStore: t, trustStore: t,
statsCollector: newStatsCollector(1 * time.Second), statsCollector: newStatsCollector(1 * time.Second),
} }
if err := daemon.restore(); err != nil {
return nil, err
}
// set up filesystem watch on resolv.conf for network changes
if err := daemon.setupResolvconfWatcher(); err != nil {
return nil, err
}
// Setup shutdown handlers // Setup shutdown handlers
// FIXME: can these shutdown handlers be registered closer to their source? // FIXME: can these shutdown handlers be registered closer to their source?
@ -1030,6 +1022,15 @@ func NewDaemonFromDirectory(config *Config, eng *engine.Engine) (*Daemon, error)
} }
}) })
if err := daemon.restore(); err != nil {
return nil, err
}
// set up filesystem watch on resolv.conf for network changes
if err := daemon.setupResolvconfWatcher(); err != nil {
return nil, err
}
return daemon, nil return daemon, nil
} }

29
docker/daemon.go
View file

@ -101,11 +101,17 @@ func mainDaemon() {
// load the daemon in the background so we can immediately start // load the daemon in the background so we can immediately start
// the http api so that connections don't fail while the daemon // the http api so that connections don't fail while the daemon
// is booting // is booting
daemonWait := make(chan struct{})
go func() { go func() {
defer func() {
close(daemonWait)
}()
d, err := daemon.NewDaemon(daemonCfg, eng) d, err := daemon.NewDaemon(daemonCfg, eng)
if err != nil { if err != nil {
log.Fatal(err) log.Error(err)
return
} }
log.Infof("docker daemon: %s %s; execdriver: %s; graphdriver: %s", log.Infof("docker daemon: %s %s; execdriver: %s; graphdriver: %s",
dockerversion.VERSION, dockerversion.VERSION,
dockerversion.GITCOMMIT, dockerversion.GITCOMMIT,
@ -114,7 +120,8 @@ func mainDaemon() {
) )
if err := d.Install(eng); err != nil { if err := d.Install(eng); err != nil {
log.Fatal(err) log.Error(err)
return
} }
b := &builder.BuilderJob{eng, d} b := &builder.BuilderJob{eng, d}
@ -123,8 +130,11 @@ func mainDaemon() {
// after the daemon is done setting up we can tell the api to start // after the daemon is done setting up we can tell the api to start
// accepting connections // accepting connections
if err := eng.Job("acceptconnections").Run(); err != nil { if err := eng.Job("acceptconnections").Run(); err != nil {
log.Fatal(err) log.Error(err)
return
} }
log.Debugf("daemon finished")
}() }()
// Serve api // Serve api
@ -141,7 +151,16 @@ func mainDaemon() {
job.Setenv("TlsCert", *flCert) job.Setenv("TlsCert", *flCert)
job.Setenv("TlsKey", *flKey) job.Setenv("TlsKey", *flKey)
job.SetenvBool("BufferRequests", true) job.SetenvBool("BufferRequests", true)
if err := job.Run(); err != nil { err := job.Run()
log.Fatal(err)
// Wait for the daemon startup goroutine to finish
// This makes sure we can actually cleanly shutdown the daemon
log.Infof("waiting for daemon to initialize")
<-daemonWait
eng.Shutdown()
if err != nil {
// log errors here so the log output looks more consistent
log.Fatalf("shutting down daemon due to errors: %v", err)
} }
} }