InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove duplicated lazy volume initialization.

Browse Source 
Signed-off-by: David Calavera <david.calavera@gmail.com>
This commit is contained in:
David Calavera
2016-01-12 17:18:57 -05:00
parent 2aa673aed7
commit aab3596397
5 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
daemon/volumes_unix.go
View File

@@ -20,13 +20,8 @@ import (
func (daemon *Daemon) setupMounts(container *container.Container) ([]execdriver.Mount, error) {
var mounts []execdriver.Mount
for _, m := range container.MountPoints {
// Lazy initialize m.Volume if needed. This happens after a daemon restart
if len(m.Driver) > 0 && m.Volume == nil {
v, err := daemon.createVolume(m.Name, m.Driver, nil)
if err != nil {
return nil, err
}
m.Volume = v
if err := daemon.lazyInitializeVolume(container.ID, m); err != nil {
return nil, err
}
path, err := m.Setup()
if err != nil {