1. docker
  2. Commit 0d9e54367f7bf7da9670de723d533eaa920868c8
Browse code

Fix deadlock on stop failure

Guillaume J. Charmes authored on 2013/04/10 04:06:01
Showing 1 changed files
container.go
History View file @ 0d9e543
... ... 
@@ -579,7 +579,7 @@ func (container *Container) Stop() error {
579 579 
 	// 2. Wait for the process to exit on its own
580 580 
 	if err := container.WaitTimeout(10 * time.Second); err != nil {
581 581 
 		log.Printf("Container %v failed to exit within 10 seconds of SIGTERM - using the force", container.Id)
582 
-		if err := container.Kill(); err != nil {
582 
+		if err := container.kill(); err != nil {
583 583 
 			return err
584 584 
 		}
585 585 
 	}