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

Fix container register failed during daemon start and try to start the container 

Signed-off-by: Lei Jitang <leijitang@huawei.com>
This commit is contained in:
Lei Jitang 2015-09-13 22:52:56 -04:00
parent 611dbd8957
commit b4841dd237
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
daemon/daemon.go
View File

@ -314,7 +314,9 @@ func (daemon *Daemon) restore() error {
} }
if err := daemon.Register(container); err != nil { if err := daemon.Register(container); err != nil {
logrus.Debugf("Failed to register container %s: %s", container.ID, err) logrus.Errorf("Failed to register container %s: %s", container.ID, err)
// The container register failed should not be started.
return
} }
// check the restart policy on the containers and restart any container with // check the restart policy on the containers and restart any container with
@ -323,7 +325,7 @@ func (daemon *Daemon) restore() error {
logrus.Debugf("Starting container %s", container.ID) logrus.Debugf("Starting container %s", container.ID)
if err := container.Start(); err != nil { if err := container.Start(); err != nil {
logrus.Debugf("Failed to start container %s: %s", container.ID, err) logrus.Errorf("Failed to start container %s: %s", container.ID, err)
} }
} }
}(c.container, c.registered) }(c.container, c.registered)