mirror of
				https://github.com/moby/moby.git
				synced 2022-11-09 12:21:53 -05:00 
			
		
		
		
	Add trivial copy-based CoW backend
This creates a container by copying the corresponding files from the layers into the containers. This is not gonna be very useful on a developer setup, as there is no copy-on-write or general diskspace sharing. It also makes container instantiation slower. However, it may be useful in deployment where we don't always have a lot of containers running (long-running daemons) and where we don't do a lot of docker commits.
This commit is contained in:
		
							parent
							
								
									ad0a6a03e3
								
							
						
					
					
						commit
						adae684987
					
				
					 3 changed files with 71 additions and 5 deletions
				
			
		| 
						 | 
					@ -1208,7 +1208,11 @@ func (container *Container) GetImage() (*Image, error) {
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func (container *Container) Mounted() (bool, error) {
 | 
					func (container *Container) Mounted() (bool, error) {
 | 
				
			||||||
	return Mounted(container.RootfsPath())
 | 
						image, err := container.GetImage()
 | 
				
			||||||
 | 
						if err != nil {
 | 
				
			||||||
 | 
							return false, err
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
						return image.Mounted(container.runtime, container.RootfsPath(), container.rwPath())
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func (container *Container) Unmount() error {
 | 
					func (container *Container) Unmount() error {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										68
									
								
								image.go
									
										
									
									
									
								
							
							
						
						
									
										68
									
								
								image.go
									
										
									
									
									
								
							| 
						 | 
					@ -442,16 +442,38 @@ func (image *Image) ensureImageDevice(devices DeviceSet) error {
 | 
				
			||||||
	return nil
 | 
						return nil
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					func (image *Image) Mounted(runtime *Runtime, root, rw string) (bool, error) {
 | 
				
			||||||
 | 
						method := runtime.GetMountMethod()
 | 
				
			||||||
 | 
						if method == MountMethodFilesystem {
 | 
				
			||||||
 | 
							if _, err := os.Stat(rw); err != nil {
 | 
				
			||||||
 | 
								if os.IsNotExist(err) {
 | 
				
			||||||
 | 
									err = nil
 | 
				
			||||||
 | 
								}
 | 
				
			||||||
 | 
								return false, err
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
							mountedPath := path.Join(rw, ".fs-mounted")
 | 
				
			||||||
 | 
							if _, err := os.Stat(mountedPath); err != nil {
 | 
				
			||||||
 | 
								if os.IsNotExist(err) {
 | 
				
			||||||
 | 
									err = nil
 | 
				
			||||||
 | 
								}
 | 
				
			||||||
 | 
								return false, err
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
							return true, nil
 | 
				
			||||||
 | 
						} else {
 | 
				
			||||||
 | 
							return Mounted(root)
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func (image *Image) Mount(runtime *Runtime, root, rw string, id string) error {
 | 
					func (image *Image) Mount(runtime *Runtime, root, rw string, id string) error {
 | 
				
			||||||
	if mounted, err := Mounted(root); err != nil {
 | 
						if mounted, _ := image.Mounted(runtime, root, rw); mounted {
 | 
				
			||||||
		return err
 | 
					 | 
				
			||||||
	} else if mounted {
 | 
					 | 
				
			||||||
		return fmt.Errorf("%s is already mounted", root)
 | 
							return fmt.Errorf("%s is already mounted", root)
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	// Create the target directories if they don't exist
 | 
						// Create the target directories if they don't exist
 | 
				
			||||||
	if err := os.Mkdir(root, 0755); err != nil && !os.IsExist(err) {
 | 
						if err := os.Mkdir(root, 0755); err != nil && !os.IsExist(err) {
 | 
				
			||||||
		return err
 | 
							return err
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	switch runtime.GetMountMethod() {
 | 
						switch runtime.GetMountMethod() {
 | 
				
			||||||
	case MountMethodNone:
 | 
						case MountMethodNone:
 | 
				
			||||||
		return fmt.Errorf("No supported Mount implementation")
 | 
							return fmt.Errorf("No supported Mount implementation")
 | 
				
			||||||
| 
						 | 
					@ -502,6 +524,29 @@ func (image *Image) Mount(runtime *Runtime, root, rw string, id string) error {
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						case MountMethodFilesystem:
 | 
				
			||||||
 | 
							if err := os.Mkdir(rw, 0755); err != nil && !os.IsExist(err) {
 | 
				
			||||||
 | 
								return err
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							layers, err := image.layers()
 | 
				
			||||||
 | 
							if err != nil {
 | 
				
			||||||
 | 
								return err
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							for i := len(layers)-1; i >= 0; i-- {
 | 
				
			||||||
 | 
								layer := layers[i]
 | 
				
			||||||
 | 
								if err = image.applyLayer(layer, root); err != nil {
 | 
				
			||||||
 | 
									return err
 | 
				
			||||||
 | 
								}
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							mountedPath := path.Join(rw, ".fs-mounted")
 | 
				
			||||||
 | 
							fo, err := os.Create(mountedPath)
 | 
				
			||||||
 | 
							if err != nil {
 | 
				
			||||||
 | 
								return err
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
							fo.Close()
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	return nil
 | 
						return nil
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					@ -527,7 +572,11 @@ func (image *Image) Unmount(runtime *Runtime, root string, id string) error {
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		return devices.DeactivateDevice(id)
 | 
							return devices.DeactivateDevice(id)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						case MountMethodFilesystem:
 | 
				
			||||||
 | 
							return nil
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	return nil
 | 
						return nil
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -563,6 +612,17 @@ func (image *Image) Changes(runtime *Runtime, root, rw, id string) ([]Change, er
 | 
				
			||||||
			return nil, err
 | 
								return nil, err
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
		return changes, nil
 | 
							return changes, nil
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						case MountMethodFilesystem:
 | 
				
			||||||
 | 
							layers, err := image.layers()
 | 
				
			||||||
 | 
							if err != nil {
 | 
				
			||||||
 | 
								return nil, err
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
							changes, err := ChangesLayers(root, layers)
 | 
				
			||||||
 | 
							if err != nil {
 | 
				
			||||||
 | 
								return nil, err
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
							return changes, nil
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	return nil, fmt.Errorf("No supported Changes implementation")
 | 
						return nil, fmt.Errorf("No supported Changes implementation")
 | 
				
			||||||
| 
						 | 
					@ -573,7 +633,7 @@ func (image *Image) ExportChanges(runtime *Runtime, root, rw, id string) (Archiv
 | 
				
			||||||
	case MountMethodAUFS:
 | 
						case MountMethodAUFS:
 | 
				
			||||||
		return Tar(rw, Uncompressed)
 | 
							return Tar(rw, Uncompressed)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	case MountMethodDeviceMapper:
 | 
						case MountMethodFilesystem, MountMethodDeviceMapper:
 | 
				
			||||||
		changes, err := image.Changes(runtime, root, rw, id)
 | 
							changes, err := image.Changes(runtime, root, rw, id)
 | 
				
			||||||
		if err != nil {
 | 
							if err != nil {
 | 
				
			||||||
			return nil, err
 | 
								return nil, err
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -23,6 +23,7 @@ const (
 | 
				
			||||||
	MountMethodNone MountMethod = iota
 | 
						MountMethodNone MountMethod = iota
 | 
				
			||||||
	MountMethodAUFS
 | 
						MountMethodAUFS
 | 
				
			||||||
	MountMethodDeviceMapper
 | 
						MountMethodDeviceMapper
 | 
				
			||||||
 | 
						MountMethodFilesystem
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
type Capabilities struct {
 | 
					type Capabilities struct {
 | 
				
			||||||
| 
						 | 
					@ -124,6 +125,7 @@ func (runtime *Runtime) GetMountMethod() MountMethod {
 | 
				
			||||||
				runtime.mountMethod = MountMethodDeviceMapper
 | 
									runtime.mountMethod = MountMethodDeviceMapper
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
							runtime.mountMethod = MountMethodFilesystem
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	return runtime.mountMethod
 | 
						return runtime.mountMethod
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue