Merge pull request moby#19273 from calavera/volume-lazy-init

[Carry 18549] Lazy initialize Volume on container Mount object.
bfirsh · Jan 13, 2016 · 184040b · 184040b
2 parents 0ee6412 + aab3596
commit 184040b
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 7 deletions.
diff --git a/daemon/mounts.go b/daemon/mounts.go
@@ -10,13 +10,8 @@ import (
 
 func (daemon *Daemon) prepareMountPoints(container *container.Container) error {
 	for _, config := range container.MountPoints {
-		if len(config.Driver) > 0 {
-			v, err := daemon.volumes.GetWithRef(config.Name, config.Driver, container.ID)
-			if err != nil {
-				return err
-			}
-
-			config.Volume = v
+		if err := daemon.lazyInitializeVolume(container.ID, config); err != nil {
+			return err
 		}
 	}
 	return nil

diff --git a/daemon/volumes.go b/daemon/volumes.go
@@ -153,3 +153,17 @@ func (daemon *Daemon) registerMountPoints(container *container.Container, hostCo
 
 	return nil
 }
+
+// lazyInitializeVolume initializes a mountpoint's volume if needed.
+// This happens after a daemon restart.
+func (daemon *Daemon) lazyInitializeVolume(containerID string, m *volume.MountPoint) error {
+	if len(m.Driver) > 0 && m.Volume == nil {
+		v, err := daemon.volumes.GetWithRef(m.Name, m.Driver, containerID)
+
+		if err != nil {
+			return err
+		}
+		m.Volume = v
+	}
+	return nil
+}
diff --git a/daemon/volumes_unix.go b/daemon/volumes_unix.go
@@ -20,6 +20,9 @@ import (
 func (daemon *Daemon) setupMounts(container *container.Container) ([]execdriver.Mount, error) {
 	var mounts []execdriver.Mount
 	for _, m := range container.MountPoints {
+		if err := daemon.lazyInitializeVolume(container.ID, m); err != nil {
+			return nil, err
+		}
 		path, err := m.Setup()
 		if err != nil {
 			return nil, err

diff --git a/daemon/volumes_windows.go b/daemon/volumes_windows.go
@@ -18,6 +18,9 @@ import (
 func (daemon *Daemon) setupMounts(container *container.Container) ([]execdriver.Mount, error) {
 	var mnts []execdriver.Mount
 	for _, mount := range container.MountPoints { // type is volume.MountPoint
+		if err := daemon.lazyInitializeVolume(container.ID, mount); err != nil {
+			return nil, err
+		}
 		// If there is no source, take it from the volume path
 		s := mount.Source
 		if s == "" && mount.Volume != nil {