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

Merge pull request #11211 from cpuguy83/ensure_engine_shutdown

Browse source 
Ensure clean engine shutdown on startup errors
This commit is contained in:
Jessie Frazelle 2015-03-10 12:13:35 -07:00
commit e4b753c1de
2 changed files with 33 additions and 13 deletions
Show stats 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,
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
// 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
}

29
docker/daemon.go
View file

@ -101,11 +101,17 @@ func mainDaemon() {
// load the daemon in the background so we can immediately start
// the http api so that connections don't fail while the daemon
// is booting
daemonWait := make(chan struct{})
go func() {
defer func() {
close(daemonWait)
}()
d, err := daemon.NewDaemon(daemonCfg, eng)
if err != nil {
log.Fatal(err)
log.Error(err)
return
}
log.Infof("docker daemon: %s %s; execdriver: %s; graphdriver: %s",
dockerversion.VERSION,
dockerversion.GITCOMMIT,
@ -114,7 +120,8 @@ func mainDaemon() {
)
if err := d.Install(eng); err != nil {
log.Fatal(err)
log.Error(err)
return
}
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
// accepting connections
if err := eng.Job("acceptconnections").Run(); err != nil {
log.Fatal(err)
log.Error(err)
return
}
log.Debugf("daemon finished")
}()
// Serve api
@ -141,7 +151,16 @@ func mainDaemon() {
job.Setenv("TlsCert", *flCert)
job.Setenv("TlsKey", *flKey)
job.SetenvBool("BufferRequests", true)
if err := job.Run(); err != nil {
log.Fatal(err)
err := job.Run()
// 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)
}
}