deleted file mode 100644

@@ -1,320 +0,0 @@

-/*

-

-aufs driver directory structure

-

-.

-├── layers // Metadata of layers

-│   ├── 1

-│   ├── 2

-│   └── 3

-├── diffs  // Content of the layer

-│   ├── 1  // Contains layers that need to be mounted for the id

-│   ├── 2

-│   └── 3

-└── mnt    // Mount points for the rw layers to be mounted

-    ├── 1

-    ├── 2

-    └── 3

-

-*/

-

-package aufs

-

-import (

-	"bufio"

-	"fmt"

-	"github.com/dotcloud/docker/archive"

-	"github.com/dotcloud/docker/graphdriver"

-	"github.com/dotcloud/docker/utils"

-	"log"

-	"os"

-	"os/exec"

-	"path"

-	"strings"

-)

-

-func init() {

-	graphdriver.Register("aufs", Init)

-}

-

-type AufsDriver struct {

-	root string

-}

-

-// New returns a new AUFS driver.

-// An error is returned if AUFS is not supported.

-func Init(root string) (graphdriver.Driver, error) {

-	// Try to load the aufs kernel module

-	if err := supportsAufs(); err != nil {

-		return nil, err

-	}

-	paths := []string{

-		"mnt",

-		"diff",

-		"layers",

-	}

-

-	// Create the root aufs driver dir and return

-	// if it already exists

-	// If not populate the dir structure

-	if err := os.MkdirAll(root, 0755); err != nil {

-		if os.IsExist(err) {

-			return &AufsDriver{root}, nil

-		}

-		return nil, err

-	}

-

-	for _, p := range paths {

-		if err := os.MkdirAll(path.Join(root, p), 0755); err != nil {

-			return nil, err

-		}

-	}

-	return &AufsDriver{root}, nil

-}

-

-// Return a nil error if the kernel supports aufs

-// We cannot modprobe because inside dind modprobe fails

-// to run

-func supportsAufs() error {

-	// We can try to modprobe aufs first before looking at

-	// proc/filesystems for when aufs is supported

-	exec.Command("modprobe", "aufs").Run()

-

-	f, err := os.Open("/proc/filesystems")

-	if err != nil {

-		return err

-	}

-	defer f.Close()

-

-	s := bufio.NewScanner(f)

-	for s.Scan() {

-		if strings.Contains(s.Text(), "aufs") {

-			return nil

-		}

-	}

-	return fmt.Errorf("AUFS was not found in /proc/filesystems")

-}

-

-func (a *AufsDriver) rootPath() string {

-	return a.root

-}

-

-func (a *AufsDriver) String() string {

-	return "aufs"

-}

-

-func (d *AufsDriver) Status() [][2]string {

-	return nil

-}

-

-// Three folders are created for each id

-// mnt, layers, and diff

-func (a *AufsDriver) Create(id, parent string) error {

-	if err := a.createDirsFor(id); err != nil {

-		return err

-	}

-	// Write the layers metadata

-	f, err := os.Create(path.Join(a.rootPath(), "layers", id))

-	if err != nil {

-		return err

-	}

-	defer f.Close()

-

-	if parent != "" {

-		ids, err := getParentIds(a.rootPath(), parent)

-		if err != nil {

-			return err

-		}

-

-		if _, err := fmt.Fprintln(f, parent); err != nil {

-			return err

-		}

-		for _, i := range ids {

-			if _, err := fmt.Fprintln(f, i); err != nil {

-				return err

-			}

-		}

-	}

-	return nil

-}

-

-func (a *AufsDriver) createDirsFor(id string) error {

-	paths := []string{

-		"mnt",

-		"diff",

-	}

-

-	for _, p := range paths {

-		if err := os.MkdirAll(path.Join(a.rootPath(), p, id), 0755); err != nil {

-			return err

-		}

-	}

-	return nil

-}

-

-// Unmount and remove the dir information

-func (a *AufsDriver) Remove(id string) error {

-	// Make sure the dir is umounted first

-	if err := a.unmount(id); err != nil {

-		return err

-	}

-	tmpDirs := []string{

-		"mnt",

-		"diff",

-	}

-

-	// Remove the dirs atomically

-	for _, p := range tmpDirs {

-		// We need to use a temp dir in the same dir as the driver so Rename

-		// does not fall back to the slow copy if /tmp and the driver dir

-		// are on different devices

-		tmp := path.Join(a.rootPath(), "tmp", p, id)

-		if err := os.MkdirAll(tmp, 0755); err != nil {

-			return err

-		}

-		realPath := path.Join(a.rootPath(), p, id)

-		if err := os.Rename(realPath, tmp); err != nil {

-			return err

-		}

-		defer os.RemoveAll(tmp)

-	}

-

-	// Remove the layers file for the id

-	return os.Remove(path.Join(a.rootPath(), "layers", id))

-}

-

-// Return the rootfs path for the id

-// This will mount the dir at it's given path

-func (a *AufsDriver) Get(id string) (string, error) {

-	ids, err := getParentIds(a.rootPath(), id)

-	if err != nil {

-		if !os.IsNotExist(err) {

-			return "", err

-		}

-		ids = []string{}

-	}

-

-	// If a dir does not have a parent ( no layers )do not try to mount

-	// just return the diff path to the data

-	out := path.Join(a.rootPath(), "diff", id)

-	if len(ids) > 0 {

-		out = path.Join(a.rootPath(), "mnt", id)

-		if err := a.mount(id); err != nil {

-			return "", err

-		}

-	}

-	return out, nil

-}

-

-// Returns an archive of the contents for the id

-func (a *AufsDriver) Diff(id string) (archive.Archive, error) {

-	return archive.TarFilter(path.Join(a.rootPath(), "diff", id), &archive.TarOptions{

-		Recursive:   true,

-		Compression: archive.Uncompressed,

-	})

-}

-

-func (a *AufsDriver) ApplyDiff(id string, diff archive.Archive) error {

-	return archive.Untar(diff, path.Join(a.rootPath(), "diff", id), nil)

-}

-

-// Returns the size of the contents for the id

-func (a *AufsDriver) Size(id string) (int64, error) {

-	return utils.TreeSize(path.Join(a.rootPath(), "diff", id))

-}

-

-func (a *AufsDriver) Changes(id string) ([]archive.Change, error) {

-	layers, err := a.getParentLayerPaths(id)

-	if err != nil {

-		return nil, err

-	}

-	return archive.Changes(layers, path.Join(a.rootPath(), "diff", id))

-}

-

-func (a *AufsDriver) getParentLayerPaths(id string) ([]string, error) {

-	parentIds, err := getParentIds(a.rootPath(), id)

-	if err != nil {

-		return nil, err

-	}

-	if len(parentIds) == 0 {

-		return nil, fmt.Errorf("Dir %s does not have any parent layers", id)

-	}

-	layers := make([]string, len(parentIds))

-

-	// Get the diff paths for all the parent ids

-	for i, p := range parentIds {

-		layers[i] = path.Join(a.rootPath(), "diff", p)

-	}

-	return layers, nil

-}

-

-func (a *AufsDriver) mount(id string) error {

-	// If the id is mounted or we get an error return

-	if mounted, err := a.mounted(id); err != nil || mounted {

-		return err

-	}

-

-	var (

-		target = path.Join(a.rootPath(), "mnt", id)

-		rw     = path.Join(a.rootPath(), "diff", id)

-	)

-

-	layers, err := a.getParentLayerPaths(id)

-	if err != nil {

-		return err

-	}

-

-	if err := a.aufsMount(layers, rw, target); err != nil {

-		return err

-	}

-	return nil

-}

-

-func (a *AufsDriver) unmount(id string) error {

-	if mounted, err := a.mounted(id); err != nil || !mounted {

-		return err

-	}

-	target := path.Join(a.rootPath(), "mnt", id)

-	return Unmount(target)

-}

-

-func (a *AufsDriver) mounted(id string) (bool, error) {

-	target := path.Join(a.rootPath(), "mnt", id)

-	return Mounted(target)

-}

-

-// During cleanup aufs needs to unmount all mountpoints

-func (a *AufsDriver) Cleanup() error {

-	ids, err := loadIds(path.Join(a.rootPath(), "layers"))

-	if err != nil {

-		return err

-	}

-	for _, id := range ids {

-		if err := a.unmount(id); err != nil {

-			return err

-		}

-	}

-	return nil

-}

-

-func (a *AufsDriver) aufsMount(ro []string, rw, target string) error {

-	rwBranch := fmt.Sprintf("%v=rw", rw)

-	roBranches := ""

-	for _, layer := range ro {

-		roBranches += fmt.Sprintf("%v=ro+wh:", layer)

-	}

-	branches := fmt.Sprintf("br:%v:%v,xino=/dev/shm/aufs.xino", rwBranch, roBranches)

-

-	//if error, try to load aufs kernel module

-	if err := mount("none", target, "aufs", 0, branches); err != nil {

-		log.Printf("Kernel does not support AUFS, trying to load the AUFS module with modprobe...")

-		if err := exec.Command("modprobe", "aufs").Run(); err != nil {

-			return fmt.Errorf("Unable to load the AUFS module")

-		}

-		log.Printf("...module loaded.")

-		if err := mount("none", target, "aufs", 0, branches); err != nil {

-			return fmt.Errorf("Unable to mount using aufs %s", err)

-		}

-	}

-	return nil

-}

deleted file mode 100644

@@ -1,517 +0,0 @@

-package aufs

-

-import (

-	"github.com/dotcloud/docker/archive"

-	"os"

-	"path"

-	"testing"

-)

-

-var (

-	tmp = path.Join(os.TempDir(), "aufs-tests", "aufs")

-)

-

-func newDriver(t *testing.T) *AufsDriver {

-	if err := os.MkdirAll(tmp, 0755); err != nil {

-		t.Fatal(err)

-	}

-

-	d, err := Init(tmp)

-	if err != nil {

-		t.Fatal(err)

-	}

-	return d.(*AufsDriver)

-}

-

-func TestNewAufsDriver(t *testing.T) {

-	if err := os.MkdirAll(tmp, 0755); err != nil {

-		t.Fatal(err)

-	}

-

-	d, err := Init(tmp)

-	if err != nil {

-		t.Fatal(err)

-	}

-	defer os.RemoveAll(tmp)

-	if d == nil {

-		t.Fatalf("Driver should not be nil")

-	}

-}

-

-func TestAufsString(t *testing.T) {

-	d := newDriver(t)

-	defer os.RemoveAll(tmp)

-

-	if d.String() != "aufs" {

-		t.Fatalf("Expected aufs got %s", d.String())

-	}

-}

-

-func TestCreateDirStructure(t *testing.T) {

-	newDriver(t)

-	defer os.RemoveAll(tmp)

-

-	paths := []string{

-		"mnt",

-		"layers",

-		"diff",

-	}

-

-	for _, p := range paths {

-		if _, err := os.Stat(path.Join(tmp, p)); err != nil {

-			t.Fatal(err)

-		}

-	}

-}

-

-// We should be able to create two drivers with the same dir structure

-func TestNewDriverFromExistingDir(t *testing.T) {

-	if err := os.MkdirAll(tmp, 0755); err != nil {

-		t.Fatal(err)

-	}

-

-	if _, err := Init(tmp); err != nil {

-		t.Fatal(err)

-	}

-	if _, err := Init(tmp); err != nil {

-		t.Fatal(err)

-	}

-	os.RemoveAll(tmp)

-}

-

-func TestCreateNewDir(t *testing.T) {

-	d := newDriver(t)

-	defer os.RemoveAll(tmp)

-

-	if err := d.Create("1", ""); err != nil {

-		t.Fatal(err)

-	}

-}

-

-func TestCreateNewDirStructure(t *testing.T) {

-	d := newDriver(t)

-	defer os.RemoveAll(tmp)

-

-	if err := d.Create("1", ""); err != nil {

-		t.Fatal(err)

-	}

-

-	paths := []string{

-		"mnt",

-		"diff",

-		"layers",

-	}

-

-	for _, p := range paths {

-		if _, err := os.Stat(path.Join(tmp, p, "1")); err != nil {

-			t.Fatal(err)

-		}

-	}

-}

-

-func TestRemoveImage(t *testing.T) {

-	d := newDriver(t)

-	defer os.RemoveAll(tmp)

-

-	if err := d.Create("1", ""); err != nil {

-		t.Fatal(err)

-	}

-

-	if err := d.Remove("1"); err != nil {

-		t.Fatal(err)

-	}

-

-	paths := []string{

-		"mnt",

-		"diff",

-		"layers",

-	}

-

-	for _, p := range paths {

-		if _, err := os.Stat(path.Join(tmp, p, "1")); err == nil {

-			t.Fatalf("Error should not be nil because dirs with id 1 should be delted: %s", p)

-		}

-	}

-}

-

-func TestGetWithoutParent(t *testing.T) {

-	d := newDriver(t)

-	defer os.RemoveAll(tmp)

-

-	if err := d.Create("1", ""); err != nil {

-		t.Fatal(err)

-	}

-

-	diffPath, err := d.Get("1")

-	if err != nil {

-		t.Fatal(err)

-	}

-	expected := path.Join(tmp, "diff", "1")

-	if diffPath != expected {

-		t.Fatalf("Expected path %s got %s", expected, diffPath)

-	}

-}

-

-func TestCleanupWithNoDirs(t *testing.T) {

-	d := newDriver(t)

-	defer os.RemoveAll(tmp)

-

-	if err := d.Cleanup(); err != nil {

-		t.Fatal(err)

-	}

-}

-

-func TestCleanupWithDir(t *testing.T) {

-	d := newDriver(t)

-	defer os.RemoveAll(tmp)

-

-	if err := d.Create("1", ""); err != nil {

-		t.Fatal(err)

-	}

-

-	if err := d.Cleanup(); err != nil {

-		t.Fatal(err)

-	}

-}

-

-func TestMountedFalseResponse(t *testing.T) {

-	d := newDriver(t)

-	defer os.RemoveAll(tmp)

-

-	if err := d.Create("1", ""); err != nil {

-		t.Fatal(err)

-	}

-

-	response, err := d.mounted("1")

-	if err != nil {

-		t.Fatal(err)

-	}

-

-	if response != false {

-		t.Fatalf("Response if dir id 1 is mounted should be false")

-	}

-}

-

-func TestMountedTrueReponse(t *testing.T) {

-	d := newDriver(t)

-	defer os.RemoveAll(tmp)

-	defer d.Cleanup()

-

-	if err := d.Create("1", ""); err != nil {

-		t.Fatal(err)

-	}

-	if err := d.Create("2", "1"); err != nil {

-		t.Fatal(err)

-	}

-

-	_, err := d.Get("2")

-	if err != nil {

-		t.Fatal(err)

-	}

-

-	response, err := d.mounted("2")

-	if err != nil {

-		t.Fatal(err)

-	}

-

-	if response != true {

-		t.Fatalf("Response if dir id 2 is mounted should be true")

-	}

-}

-

-func TestMountWithParent(t *testing.T) {

-	d := newDriver(t)

-	defer os.RemoveAll(tmp)

-

-	if err := d.Create("1", ""); err != nil {

-		t.Fatal(err)

-	}

-	if err := d.Create("2", "1"); err != nil {

-		t.Fatal(err)

-	}

-

-	defer func() {

-		if err := d.Cleanup(); err != nil {

-			t.Fatal(err)

-		}

-	}()

-

-	mntPath, err := d.Get("2")

-	if err != nil {

-		t.Fatal(err)

-	}

-	if mntPath == "" {

-		t.Fatal("mntPath should not be empty string")

-	}

-

-	expected := path.Join(tmp, "mnt", "2")

-	if mntPath != expected {

-		t.Fatalf("Expected %s got %s", expected, mntPath)

-	}

-}

-

-func TestRemoveMountedDir(t *testing.T) {

-	d := newDriver(t)

-	defer os.RemoveAll(tmp)

-

-	if err := d.Create("1", ""); err != nil {

-		t.Fatal(err)

-	}

-	if err := d.Create("2", "1"); err != nil {

-		t.Fatal(err)

-	}

-

-	defer func() {

-		if err := d.Cleanup(); err != nil {

-			t.Fatal(err)

-		}

-	}()

-

-	mntPath, err := d.Get("2")

-	if err != nil {

-		t.Fatal(err)

-	}

-	if mntPath == "" {

-		t.Fatal("mntPath should not be empty string")

-	}

-

-	mounted, err := d.mounted("2")

-	if err != nil {

-		t.Fatal(err)

-	}

-

-	if !mounted {

-		t.Fatalf("Dir id 2 should be mounted")

-	}

-

-	if err := d.Remove("2"); err != nil {

-		t.Fatal(err)

-	}

-}

-

-func TestCreateWithInvalidParent(t *testing.T) {

-	d := newDriver(t)

-	defer os.RemoveAll(tmp)

-

-	if err := d.Create("1", "docker"); err == nil {

-		t.Fatalf("Error should not be nil with parent does not exist")

-	}

-}

-

-func TestGetDiff(t *testing.T) {

-	d := newDriver(t)

-	defer os.RemoveAll(tmp)

-

-	if err := d.Create("1", ""); err != nil {

-		t.Fatal(err)

-	}

-

-	diffPath, err := d.Get("1")

-	if err != nil {

-		t.Fatal(err)

-	}

-

-	// Add a file to the diff path with a fixed size

-	size := int64(1024)

-

-	f, err := os.Create(path.Join(diffPath, "test_file"))

-	if err != nil {

-		t.Fatal(err)

-	}

-	if err := f.Truncate(size); err != nil {

-		t.Fatal(err)

-	}

-	f.Close()

-

-	a, err := d.Diff("1")

-	if err != nil {

-		t.Fatal(err)

-	}

-	if a == nil {

-		t.Fatalf("Archive should not be nil")

-	}

-}

-

-func TestChanges(t *testing.T) {

-	d := newDriver(t)

-	defer os.RemoveAll(tmp)

-

-	if err := d.Create("1", ""); err != nil {

-		t.Fatal(err)

-	}

-	if err := d.Create("2", "1"); err != nil {

-		t.Fatal(err)

-	}

-

-	defer func() {

-		if err := d.Cleanup(); err != nil {

-			t.Fatal(err)

-		}

-	}()

-

-	mntPoint, err := d.Get("2")

-	if err != nil {

-		t.Fatal(err)

-	}

-

-	// Create a file to save in the mountpoint

-	f, err := os.Create(path.Join(mntPoint, "test.txt"))

-	if err != nil {

-		t.Fatal(err)

-	}

-

-	if _, err := f.WriteString("testline"); err != nil {

-		t.Fatal(err)

-	}

-	if err := f.Close(); err != nil {

-		t.Fatal(err)

-	}

-

-	changes, err := d.Changes("2")

-	if err != nil {

-		t.Fatal(err)

-	}

-	if len(changes) != 1 {

-		t.Fatalf("Dir 2 should have one change from parent got %d", len(changes))

-	}

-	change := changes[0]

-

-	expectedPath := "/test.txt"

-	if change.Path != expectedPath {

-		t.Fatalf("Expected path %s got %s", expectedPath, change.Path)

-	}

-

-	if change.Kind != archive.ChangeAdd {

-		t.Fatalf("Change kind should be ChangeAdd got %s", change.Kind)

-	}

-

-	if err := d.Create("3", "2"); err != nil {

-		t.Fatal(err)

-	}

-	mntPoint, err = d.Get("3")

-	if err != nil {

-		t.Fatal(err)

-	}

-

-	// Create a file to save in the mountpoint

-	f, err = os.Create(path.Join(mntPoint, "test2.txt"))

-	if err != nil {

-		t.Fatal(err)

-	}

-

-	if _, err := f.WriteString("testline"); err != nil {

-		t.Fatal(err)

-	}

-	if err := f.Close(); err != nil {

-		t.Fatal(err)

-	}

-

-	changes, err = d.Changes("3")

-	if err != nil {

-		t.Fatal(err)

-	}

-

-	if len(changes) != 1 {

-		t.Fatalf("Dir 2 should have one change from parent got %d", len(changes))

-	}

-	change = changes[0]

-

-	expectedPath = "/test2.txt"

-	if change.Path != expectedPath {

-		t.Fatalf("Expected path %s got %s", expectedPath, change.Path)

-	}

-

-	if change.Kind != archive.ChangeAdd {

-		t.Fatalf("Change kind should be ChangeAdd got %s", change.Kind)

-	}

-}

-

-func TestDiffSize(t *testing.T) {

-	d := newDriver(t)

-	defer os.RemoveAll(tmp)

-

-	if err := d.Create("1", ""); err != nil {

-		t.Fatal(err)

-	}

-

-	diffPath, err := d.Get("1")

-	if err != nil {

-		t.Fatal(err)

-	}

-

-	// Add a file to the diff path with a fixed size

-	size := int64(1024)

-

-	f, err := os.Create(path.Join(diffPath, "test_file"))

-	if err != nil {

-		t.Fatal(err)

-	}

-	f.Truncate(size)

-	s, err := f.Stat()

-	if err != nil {

-		t.Fatal(err)

-	}

-	size = s.Size()

-	if err := f.Close(); err != nil {

-		t.Fatal(err)

-	}

-

-	diffSize, err := d.Size("1")

-	if err != nil {

-		t.Fatal(err)

-	}

-	if diffSize != size {

-		t.Fatalf("Expected size to be %d got %d", size, diffSize)

-	}

-}

-

-func TestApplyDiff(t *testing.T) {

-	d := newDriver(t)

-	defer os.RemoveAll(tmp)

-	defer d.Cleanup()

-

-	if err := d.Create("1", ""); err != nil {

-		t.Fatal(err)

-	}

-

-	diffPath, err := d.Get("1")

-	if err != nil {

-		t.Fatal(err)

-	}

-

-	// Add a file to the diff path with a fixed size

-	size := int64(1024)

-

-	f, err := os.Create(path.Join(diffPath, "test_file"))

-	if err != nil {

-		t.Fatal(err)

-	}

-	f.Truncate(size)

-	f.Close()

-

-	diff, err := d.Diff("1")

-	if err != nil {

-		t.Fatal(err)

-	}

-

-	if err := d.Create("2", ""); err != nil {

-		t.Fatal(err)

-	}

-	if err := d.Create("3", "2"); err != nil {

-		t.Fatal(err)

-	}

-

-	if err := d.ApplyDiff("3", diff); err != nil {

-		t.Fatal(err)

-	}

-

-	// Ensure that the file is in the mount point for id 3

-

-	mountPoint, err := d.Get("3")

-	if err != nil {

-		t.Fatal(err)

-	}

-	if _, err := os.Stat(path.Join(mountPoint, "test_file")); err != nil {

-		t.Fatal(err)

-	}

-}

deleted file mode 100644

@@ -1,46 +0,0 @@

-package aufs

-

-import (

-	"bufio"

-	"io/ioutil"

-	"os"

-	"path"

-)

-

-// Return all the directories

-func loadIds(root string) ([]string, error) {

-	dirs, err := ioutil.ReadDir(root)

-	if err != nil {

-		return nil, err

-	}

-	out := []string{}

-	for _, d := range dirs {

-		if !d.IsDir() {

-			out = append(out, d.Name())

-		}

-	}

-	return out, nil

-}

-

-// Read the layers file for the current id and return all the