docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7572 from shykes/workaround-api-shutdown 

Workaround to avoid 5 second delay on graceful daemon restart
This commit is contained in:
Victor Vieux 2014-08-13 15:41:33 -07:00
parent 13eb477b62 6aecdb4f8e
commit 6b363b81de
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
engine/job.go
View File

@ -49,10 +49,17 @@ func (job *Job) Run() error {
if job.Eng.IsShutdown() { if job.Eng.IsShutdown() {
return fmt.Errorf("engine is shutdown") return fmt.Errorf("engine is shutdown")
} }
job.Eng.l.Lock() // FIXME: this is a temporary workaround to avoid Engine.Shutdown
job.Eng.tasks.Add(1) // waiting 5 seconds for server/api.ServeApi to complete (which it never will)
job.Eng.l.Unlock() // everytime the daemon is cleanly restarted.
defer job.Eng.tasks.Done() // The permanent fix is to implement Job.Stop and Job.OnStop so that
// ServeApi can cooperate and terminate cleanly.
if job.Name != "serveapi" {
job.Eng.l.Lock()
job.Eng.tasks.Add(1)
job.Eng.l.Unlock()
defer job.Eng.tasks.Done()
}
// FIXME: make this thread-safe // FIXME: make this thread-safe
// FIXME: implement wait // FIXME: implement wait
if !job.end.IsZero() { if !job.end.IsZero() {