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

Fix name collision handling in restore

Browse source 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi 2016-09-29 08:35:10 -07:00
parent ad398f132b
commit a9c1575b1a
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
daemon/daemon.go
View file

@ -152,13 +152,15 @@ func (daemon *Daemon) restore() error {
removeContainers := make(map[string]*container.Container) removeContainers := make(map[string]*container.Container)
restartContainers := make(map[*container.Container]chan struct{}) restartContainers := make(map[*container.Container]chan struct{})
activeSandboxes := make(map[string]interface{}) activeSandboxes := make(map[string]interface{})
for _, c := range containers { for id, c := range containers {
if err := daemon.registerName(c); err != nil { if err := daemon.registerName(c); err != nil {
logrus.Errorf("Failed to register container %s: %s", c.ID, err) logrus.Errorf("Failed to register container %s: %s", c.ID, err)
delete(containers, id)
continue continue
} }
if err := daemon.Register(c); err != nil { if err := daemon.Register(c); err != nil {
logrus.Errorf("Failed to register container %s: %s", c.ID, err) logrus.Errorf("Failed to register container %s: %s", c.ID, err)
delete(containers, id)
continue continue
} }