From 9d193b1c0099037c386f5a31c743622caebdfa7f Mon Sep 17 00:00:00 2001 From: "Guillaume J. Charmes" Date: Fri, 15 Nov 2013 17:16:30 -0800 Subject: [PATCH 1/5] WIP Upstream-commit: a518b847511f034d9bfd4166e17f8f0eac61d021 Component: engine --- components/engine/graphdriver/aufs/aufs.go | 13 ++++++-- components/engine/graphdriver/aufs/migrate.go | 32 +++++++++++++++++++ components/engine/runtime.go | 8 ++++- 3 files changed, 49 insertions(+), 4 deletions(-) create mode 100644 components/engine/graphdriver/aufs/migrate.go diff --git a/components/engine/graphdriver/aufs/aufs.go b/components/engine/graphdriver/aufs/aufs.go index c0bc069ce8..9cfaf90996 100644 --- a/components/engine/graphdriver/aufs/aufs.go +++ b/components/engine/graphdriver/aufs/aufs.go @@ -95,18 +95,25 @@ func supportsAufs() error { return fmt.Errorf("AUFS was not found in /proc/filesystems") } -func (a *AufsDriver) rootPath() string { +func (a AufsDriver) rootPath() string { return a.root } -func (a *AufsDriver) String() string { +func (AufsDriver) String() string { return "aufs" } -func (d *AufsDriver) Status() [][2]string { +func (AufsDriver) Status() [][2]string { return nil } +func (a AufsDriver) Exists(id string) bool { + if _, err := os.Lstat(path.Join(a.rootPath(), "diff", id)); err != nil { + return false + } + return true +} + // Three folders are created for each id // mnt, layers, and diff func (a *AufsDriver) Create(id, parent string) error { diff --git a/components/engine/graphdriver/aufs/migrate.go b/components/engine/graphdriver/aufs/migrate.go new file mode 100644 index 0000000000..58145aa989 --- /dev/null +++ b/components/engine/graphdriver/aufs/migrate.go @@ -0,0 +1,32 @@ +package aufs + +import ( + "io/ioutil" + "os" + "path" +) + +func exists(pth string) bool { + if _, err := os.Stat(pth); err != nil { + return false + } + return true +} + +func (a *AufsDriver) Migrate(pth string) error { + fis, err := ioutil.ReadDir(pth) + if err != nil { + return err + } + for _, fi := range fis { + if fi.IsDir() && exists(path.Join(pth, fi.Name(), "layer")) && !a.Exists(fi.Name()) { + if err := os.Symlink(path.Join(pth, fi.Name(), "layer"), path.Join(a.rootPath(), "diff", fi.Name())); err != nil { + return err + } + if err := a.Create(fi.Name(), ""); err != nil { + return err + } + } + } + return nil +} diff --git a/components/engine/runtime.go b/components/engine/runtime.go index 8ae9b97d2e..6eef38c842 100644 --- a/components/engine/runtime.go +++ b/components/engine/runtime.go @@ -8,7 +8,7 @@ import ( "github.com/dotcloud/docker/archive" "github.com/dotcloud/docker/graphdb" "github.com/dotcloud/docker/graphdriver" - _ "github.com/dotcloud/docker/graphdriver/aufs" + "github.com/dotcloud/docker/graphdriver/aufs" _ "github.com/dotcloud/docker/graphdriver/devmapper" _ "github.com/dotcloud/docker/graphdriver/dummy" "github.com/dotcloud/docker/utils" @@ -629,6 +629,12 @@ func NewRuntimeFromDirectory(config *DaemonConfig) (*Runtime, error) { return nil, err } + if ad, ok := driver.(*aufs.AufsDriver); ok { + if err := ad.Migrate(path.Join(config.Root, "graph")); err != nil { + return nil, err + } + } + if err := linkLxcStart(config.Root); err != nil { return nil, err } From 80e02fbc62e73a19486974f57962f5b13e51eabc Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Mon, 18 Nov 2013 13:16:28 -0800 Subject: [PATCH 2/5] Use tryRelocate to fall back to symlink if rename fails Upstream-commit: 94e854823f3549eeddaafa24835093966d9aaeeb Component: engine --- components/engine/graphdriver/aufs/migrate.go | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/components/engine/graphdriver/aufs/migrate.go b/components/engine/graphdriver/aufs/migrate.go index 58145aa989..3d1fa0c0f2 100644 --- a/components/engine/graphdriver/aufs/migrate.go +++ b/components/engine/graphdriver/aufs/migrate.go @@ -1,6 +1,7 @@ package aufs import ( + "fmt" "io/ioutil" "os" "path" @@ -20,7 +21,7 @@ func (a *AufsDriver) Migrate(pth string) error { } for _, fi := range fis { if fi.IsDir() && exists(path.Join(pth, fi.Name(), "layer")) && !a.Exists(fi.Name()) { - if err := os.Symlink(path.Join(pth, fi.Name(), "layer"), path.Join(a.rootPath(), "diff", fi.Name())); err != nil { + if err := tryRelocate(path.Join(pth, fi.Name(), "layer"), path.Join(a.rootPath(), "diff", fi.Name())); err != nil { return err } if err := a.Create(fi.Name(), ""); err != nil { @@ -30,3 +31,14 @@ func (a *AufsDriver) Migrate(pth string) error { } return nil } + +// tryRelocate will try to rename the old path to the new pack and if +// the operation fails, it will fallback to a symlink +func tryRelocate(oldPath, newPath string) error { + if err := os.Rename(oldPath, newPath); err != nil { + if sErr := os.Symlink(oldPath, newPath); sErr != nil { + return fmt.Errorf("Unable to relocate %s to %s: Rename err %s Symlink err %s", oldPath, newPath, err, sErr) + } + } + return nil +} From 3688213d0409f05270b97bc2c3902ff4628a9251 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Mon, 18 Nov 2013 16:17:43 -0800 Subject: [PATCH 3/5] Migrate images with parent relationship Upstream-commit: f88b760809677109a723f25399f738d756f14c13 Component: engine --- components/engine/graphdriver/aufs/migrate.go | 81 +++++++++++++++++-- 1 file changed, 74 insertions(+), 7 deletions(-) diff --git a/components/engine/graphdriver/aufs/migrate.go b/components/engine/graphdriver/aufs/migrate.go index 3d1fa0c0f2..4231ac2111 100644 --- a/components/engine/graphdriver/aufs/migrate.go +++ b/components/engine/graphdriver/aufs/migrate.go @@ -1,34 +1,83 @@ package aufs import ( + "encoding/json" "fmt" "io/ioutil" "os" "path" + "time" ) -func exists(pth string) bool { +type imageMetadata struct { + ID string `json:"id"` + ParentID string `json:"parent,omitempty"` + Created time.Time `json:"created"` + DockerVersion string `json:"docker_version,omitempty"` + Architecture string `json:"architecture,omitempty"` + + parent *imageMetadata +} + +func pathExists(pth string) bool { if _, err := os.Stat(pth); err != nil { return false } return true } +// Migrate existing images and containers from docker < 0.7.x func (a *AufsDriver) Migrate(pth string) error { fis, err := ioutil.ReadDir(pth) if err != nil { return err } + var ( + metadata = make(map[string]*imageMetadata) + current *imageMetadata + exists bool + ) + + // Load metadata for _, fi := range fis { - if fi.IsDir() && exists(path.Join(pth, fi.Name(), "layer")) && !a.Exists(fi.Name()) { - if err := tryRelocate(path.Join(pth, fi.Name(), "layer"), path.Join(a.rootPath(), "diff", fi.Name())); err != nil { - return err - } - if err := a.Create(fi.Name(), ""); err != nil { - return err + if id := fi.Name(); fi.IsDir() && pathExists(path.Join(pth, id, "layer")) && !a.Exists(id) { + if current, exists = metadata[id]; !exists { + current, err = loadMetadata(pth, id) + if err != nil { + return err + } + metadata[id] = current } } } + + // Recreate tree + for _, v := range metadata { + v.parent = metadata[v.ParentID] + } + + // Perform image migration + for _, v := range metadata { + if err := migrateImage(v, a, pth); err != nil { + return err + } + } + return nil +} + +func migrateImage(m *imageMetadata, a *AufsDriver, pth string) error { + if !pathExists(path.Join(a.rootPath(), "diff", m.ID)) { + if m.parent != nil { + migrateImage(m.parent, a, pth) + } + if err := tryRelocate(path.Join(pth, m.ID, "layer"), path.Join(a.rootPath(), "diff", m.ID)); err != nil { + return err + } + + if err := a.Create(m.ID, m.ParentID); err != nil { + return err + } + } return nil } @@ -42,3 +91,21 @@ func tryRelocate(oldPath, newPath string) error { } return nil } + +func loadMetadata(pth, id string) (*imageMetadata, error) { + f, err := os.Open(path.Join(pth, id, "json")) + if err != nil { + return nil, err + } + defer f.Close() + + var ( + out = &imageMetadata{} + dec = json.NewDecoder(f) + ) + + if err := dec.Decode(out); err != nil { + return nil, err + } + return out, nil +} From 2d65b723cd11a185b3d68e3dd708a2e9320bbc93 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Mon, 18 Nov 2013 17:20:03 -0800 Subject: [PATCH 4/5] Add container migration to aufs driver Upstream-commit: 29f07f854497571db570be79c8df878624f5b41c Component: engine --- components/engine/graphdriver/aufs/aufs.go | 2 + components/engine/graphdriver/aufs/migrate.go | 109 +++++++++++++----- components/engine/runtime.go | 2 +- 3 files changed, 85 insertions(+), 28 deletions(-) diff --git a/components/engine/graphdriver/aufs/aufs.go b/components/engine/graphdriver/aufs/aufs.go index 9cfaf90996..cf42f363fc 100644 --- a/components/engine/graphdriver/aufs/aufs.go +++ b/components/engine/graphdriver/aufs/aufs.go @@ -107,6 +107,8 @@ func (AufsDriver) Status() [][2]string { return nil } +// Exists returns true if the given id is registered with +// this driver func (a AufsDriver) Exists(id string) bool { if _, err := os.Lstat(path.Join(a.rootPath(), "diff", id)); err != nil { return false diff --git a/components/engine/graphdriver/aufs/migrate.go b/components/engine/graphdriver/aufs/migrate.go index 4231ac2111..9cdce5faaa 100644 --- a/components/engine/graphdriver/aufs/migrate.go +++ b/components/engine/graphdriver/aufs/migrate.go @@ -6,17 +6,14 @@ import ( "io/ioutil" "os" "path" - "time" ) -type imageMetadata struct { - ID string `json:"id"` - ParentID string `json:"parent,omitempty"` - Created time.Time `json:"created"` - DockerVersion string `json:"docker_version,omitempty"` - Architecture string `json:"architecture,omitempty"` +type metadata struct { + ID string `json:"id"` + ParentID string `json:"parent,omitempty"` + Image string `json:"Image,omitempty"` - parent *imageMetadata + parent *metadata } func pathExists(pth string) bool { @@ -27,48 +24,106 @@ func pathExists(pth string) bool { } // Migrate existing images and containers from docker < 0.7.x -func (a *AufsDriver) Migrate(pth string) error { +// +// The format pre 0.7 is for docker to store the metadata and filesystem +// content in the same directory. For the migration to work we need to move Image layer +// data from /var/lib/docker/graph//layers to the diff of the registered id. +// +// Next we need to migrate the container's rw layer to diff of the driver. After the +// contents are migrated we need to register the image and container ids with the +// driver. +// +// For the migration we try to move the folder containing the layer files, if that +// fails because the data is currently mounted we will fallback to creating a +// symlink. +func (a *AufsDriver) Migrate(pth string, setupInit func(p string) error) error { + if pathExists(path.Join(pth, "graph")) { + if err := a.migrateImages(path.Join(pth, "graph")); err != nil { + return err + } + return a.migrateContainers(path.Join(pth, "containers"), setupInit) + } + return nil +} + +func (a *AufsDriver) migrateContainers(pth string, setupInit func(p string) error) error { + fis, err := ioutil.ReadDir(pth) + if err != nil { + return err + } + + for _, fi := range fis { + if id := fi.Name(); fi.IsDir() && pathExists(path.Join(pth, id, "rw")) && !a.Exists(id) { + if err := tryRelocate(path.Join(pth, id, "rw"), path.Join(a.rootPath(), "diff", id)); err != nil { + return err + } + + metadata, err := loadMetadata(path.Join(pth, id, "config.json")) + if err != nil { + return err + } + + initID := fmt.Sprintf("%s-init", id) + if err := a.Create(initID, metadata.Image); err != nil { + return err + } + + initPath, err := a.Get(initID) + if err != nil { + return err + } + // setup init layer + if err := setupInit(initPath); err != nil { + return err + } + + if err := a.Create(id, initID); err != nil { + return err + } + } + } + return nil +} + +func (a *AufsDriver) migrateImages(pth string) error { fis, err := ioutil.ReadDir(pth) if err != nil { return err } var ( - metadata = make(map[string]*imageMetadata) - current *imageMetadata - exists bool + m = make(map[string]*metadata) + current *metadata + exists bool ) - // Load metadata for _, fi := range fis { if id := fi.Name(); fi.IsDir() && pathExists(path.Join(pth, id, "layer")) && !a.Exists(id) { - if current, exists = metadata[id]; !exists { - current, err = loadMetadata(pth, id) + if current, exists = m[id]; !exists { + current, err = loadMetadata(path.Join(pth, id, "json")) if err != nil { return err } - metadata[id] = current + m[id] = current } } } - // Recreate tree - for _, v := range metadata { - v.parent = metadata[v.ParentID] + for _, v := range m { + v.parent = m[v.ParentID] } - // Perform image migration - for _, v := range metadata { - if err := migrateImage(v, a, pth); err != nil { + for _, v := range m { + if err := a.migrateImage(v, pth); err != nil { return err } } return nil } -func migrateImage(m *imageMetadata, a *AufsDriver, pth string) error { +func (a *AufsDriver) migrateImage(m *metadata, pth string) error { if !pathExists(path.Join(a.rootPath(), "diff", m.ID)) { if m.parent != nil { - migrateImage(m.parent, a, pth) + a.migrateImage(m.parent, pth) } if err := tryRelocate(path.Join(pth, m.ID, "layer"), path.Join(a.rootPath(), "diff", m.ID)); err != nil { return err @@ -92,15 +147,15 @@ func tryRelocate(oldPath, newPath string) error { return nil } -func loadMetadata(pth, id string) (*imageMetadata, error) { - f, err := os.Open(path.Join(pth, id, "json")) +func loadMetadata(pth string) (*metadata, error) { + f, err := os.Open(pth) if err != nil { return nil, err } defer f.Close() var ( - out = &imageMetadata{} + out = &metadata{} dec = json.NewDecoder(f) ) diff --git a/components/engine/runtime.go b/components/engine/runtime.go index 6eef38c842..1146079070 100644 --- a/components/engine/runtime.go +++ b/components/engine/runtime.go @@ -630,7 +630,7 @@ func NewRuntimeFromDirectory(config *DaemonConfig) (*Runtime, error) { } if ad, ok := driver.(*aufs.AufsDriver); ok { - if err := ad.Migrate(path.Join(config.Root, "graph")); err != nil { + if err := ad.Migrate(config.Root, setupInitLayer); err != nil { return nil, err } } From 9820e0b026de31bd6c6a7999449d285c6166d9d6 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Mon, 18 Nov 2013 23:28:45 -0800 Subject: [PATCH 5/5] Retry moving dirs on every daemon startup This will try to move the directories that were previously symlinked until a full migration is complete. Upstream-commit: 5ee8e41e43892694f66b4d6d01ed95f4ca2e7cb6 Component: engine --- components/engine/graphdriver/aufs/aufs.go | 2 +- components/engine/graphdriver/aufs/migrate.go | 71 ++++++++++++------- 2 files changed, 45 insertions(+), 28 deletions(-) diff --git a/components/engine/graphdriver/aufs/aufs.go b/components/engine/graphdriver/aufs/aufs.go index cf42f363fc..315390ec72 100644 --- a/components/engine/graphdriver/aufs/aufs.go +++ b/components/engine/graphdriver/aufs/aufs.go @@ -110,7 +110,7 @@ func (AufsDriver) Status() [][2]string { // Exists returns true if the given id is registered with // this driver func (a AufsDriver) Exists(id string) bool { - if _, err := os.Lstat(path.Join(a.rootPath(), "diff", id)); err != nil { + if _, err := os.Lstat(path.Join(a.rootPath(), "layers", id)); err != nil { return false } return true diff --git a/components/engine/graphdriver/aufs/migrate.go b/components/engine/graphdriver/aufs/migrate.go index 9cdce5faaa..15008c27da 100644 --- a/components/engine/graphdriver/aufs/migrate.go +++ b/components/engine/graphdriver/aufs/migrate.go @@ -53,32 +53,35 @@ func (a *AufsDriver) migrateContainers(pth string, setupInit func(p string) erro } for _, fi := range fis { - if id := fi.Name(); fi.IsDir() && pathExists(path.Join(pth, id, "rw")) && !a.Exists(id) { + if id := fi.Name(); fi.IsDir() && pathExists(path.Join(pth, id, "rw")) { if err := tryRelocate(path.Join(pth, id, "rw"), path.Join(a.rootPath(), "diff", id)); err != nil { return err } - metadata, err := loadMetadata(path.Join(pth, id, "config.json")) - if err != nil { - return err - } + if !a.Exists(id) { - initID := fmt.Sprintf("%s-init", id) - if err := a.Create(initID, metadata.Image); err != nil { - return err - } + metadata, err := loadMetadata(path.Join(pth, id, "config.json")) + if err != nil { + return err + } - initPath, err := a.Get(initID) - if err != nil { - return err - } - // setup init layer - if err := setupInit(initPath); err != nil { - return err - } + initID := fmt.Sprintf("%s-init", id) + if err := a.Create(initID, metadata.Image); err != nil { + return err + } - if err := a.Create(id, initID); err != nil { - return err + initPath, err := a.Get(initID) + if err != nil { + return err + } + // setup init layer + if err := setupInit(initPath); err != nil { + return err + } + + if err := a.Create(id, initID); err != nil { + return err + } } } } @@ -97,7 +100,7 @@ func (a *AufsDriver) migrateImages(pth string) error { ) for _, fi := range fis { - if id := fi.Name(); fi.IsDir() && pathExists(path.Join(pth, id, "layer")) && !a.Exists(id) { + if id := fi.Name(); fi.IsDir() && pathExists(path.Join(pth, id, "layer")) { if current, exists = m[id]; !exists { current, err = loadMetadata(path.Join(pth, id, "json")) if err != nil { @@ -112,26 +115,29 @@ func (a *AufsDriver) migrateImages(pth string) error { v.parent = m[v.ParentID] } + migrated := make(map[string]bool) for _, v := range m { - if err := a.migrateImage(v, pth); err != nil { + if err := a.migrateImage(v, pth, migrated); err != nil { return err } } return nil } -func (a *AufsDriver) migrateImage(m *metadata, pth string) error { - if !pathExists(path.Join(a.rootPath(), "diff", m.ID)) { +func (a *AufsDriver) migrateImage(m *metadata, pth string, migrated map[string]bool) error { + if !migrated[m.ID] { if m.parent != nil { - a.migrateImage(m.parent, pth) + a.migrateImage(m.parent, pth, migrated) } if err := tryRelocate(path.Join(pth, m.ID, "layer"), path.Join(a.rootPath(), "diff", m.ID)); err != nil { return err } - - if err := a.Create(m.ID, m.ParentID); err != nil { - return err + if !a.Exists(m.ID) { + if err := a.Create(m.ID, m.ParentID); err != nil { + return err + } } + migrated[m.ID] = true } return nil } @@ -139,6 +145,17 @@ func (a *AufsDriver) migrateImage(m *metadata, pth string) error { // tryRelocate will try to rename the old path to the new pack and if // the operation fails, it will fallback to a symlink func tryRelocate(oldPath, newPath string) error { + s, err := os.Lstat(newPath) + if err != nil && !os.IsNotExist(err) { + return err + } + // If the destination is a symlink then we already tried to relocate once before + // and it failed so we delete it and try to remove + if s != nil && s.Mode()&os.ModeSymlink == os.ModeSymlink { + if err := os.RemoveAll(newPath); err != nil { + return err + } + } if err := os.Rename(oldPath, newPath); err != nil { if sErr := os.Symlink(oldPath, newPath); sErr != nil { return fmt.Errorf("Unable to relocate %s to %s: Rename err %s Symlink err %s", oldPath, newPath, err, sErr)