p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #16275 from coolljt0725/fix_register_failed_and_start

Browse Source 
Fix container register failed during daemon start and then start the container
Upstream-commit: db2ac8655d046b97b33636077faa420a700d8bfc
Component: engine
This commit is contained in:
Antonio Murdaca
2015-09-15 11:46:03 +02:00
parent 5562327b20 2cfd978e65
commit 852d9066b4
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/engine/daemon/daemon.go
View File

@ -314,7 +314,9 @@ func (daemon *Daemon) restore() error {
}
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
@ -323,7 +325,7 @@ func (daemon *Daemon) restore() error {
logrus.Debugf("Starting container %s", container.ID)
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)