fixup! move to pkg/storagemigration

pkg/storagemigration/aufsutils.go

@@ -20,7 +20,7 @@ var (
 )
 
 // CheckRootExists checks for the aufs storage root directory
-func CheckRootExists(engineDir string) error {
+func CheckAufsRootExists(engineDir string) error {
 	root := filepath.Join(engineDir, "aufs")
 	logrus.WithField("aufs_root", root).Debug("checking if aufs root exists")
 	ok, err := exists(root, true)

pkg/storagemigration/failcleanup.go

@@ -30,7 +30,7 @@ func FailCleanup(root string) error {
 		return err
 	}
 
-	err = SwitchAllContainersStorageDriver("aufs")
+	err = SwitchAllContainersStorageDriver(root, "aufs")
 	if err != nil {
 		return fmt.Errorf("Error migrating containers to aufs: %v", err)
 	}

pkg/storagemigration/migrate.go

@@ -17,24 +17,24 @@ func Migrate(root string) error {
 	logrus.WithField("storage_root", root).Info("starting aufs -> overlay2 migration")
 
 	// make sure we actually have an aufs tree to migrate from
-	err := CheckRootExists(root)
+	err := CheckAufsRootExists(root)
 	if err != nil {
 		return err
 	}
 
 	// make sure there isn't an overlay2 tree already
-	err = CheckRootExists(root)
+	err = CheckOvlRootExists(root)
 	if err == nil {
 		logrus.Warn("overlay root found, cleaning up...")
-		err := os.Remove(overlayRoot())
+		err := os.Remove(overlayRoot(root))
 		if err != nil {
 			return fmt.Errorf("Error cleaning up overlay2 root: %v", err)
 		}
 	}
 
 	var state State
 
-	diffDir := filepath.Join(aufsRoot(), "diff")
+	diffDir := filepath.Join(aufsRoot(root), "diff")
 
 	// Step 1:
 	// Scan aufs layer data and build structure holding all the relevant information
@@ -56,7 +56,7 @@ func Migrate(root string) error {
 
 		// get parent layers
 		logrus.Debug("parsing parent ids")
-		parentIDs, err := GetParentIDs(aufsRoot(), layerID)
+		parentIDs, err := GetParentIDs(aufsRoot(root), layerID)
 		if err != nil {
 			return fmt.Errorf("Error loading parent IDs for %s: %v", layerID, err)
 		}
@@ -128,7 +128,7 @@ func Migrate(root string) error {
 		logrus := logrus.WithField("layer_id", layer.ID)
 
 		var (
-			layerDir = filepath.Join(tempTargetRoot(), layer.ID)
+			layerDir = filepath.Join(tempTargetRoot(root), layer.ID)
 		)
 
 		logrus.Debugf("creating base dir %s", layerDir)
@@ -140,7 +140,7 @@ func Migrate(root string) error {
 
 		logrus.Debug("creating layer link")
 		// create /:layer_id/link file and /l/:layer_ref file
-		_, err = CreateLayerLink(tempTargetRoot(), layer.ID)
+		_, err = CreateLayerLink(tempTargetRoot(root), layer.ID)
 		if err != nil {
 			return fmt.Errorf("Error creating layer link dir for %s: %v", layer.ID, err)
 		}
@@ -151,7 +151,7 @@ func Migrate(root string) error {
 		for _, parentID := range layer.ParentIDs {
 			logrus := logrus.WithField("parent_layer_id", parentID)
 
-			parentLayerDir := filepath.Join(tempTargetRoot(), parentID)
+			parentLayerDir := filepath.Join(tempTargetRoot(root), parentID)
 			ok, err := exists(parentLayerDir, true)
 			if err != nil {
 				return fmt.Errorf("Error checking for parent layer dir for %s: %v", layer.ID, err)
@@ -165,7 +165,7 @@ func Migrate(root string) error {
 				}
 			}
 			logrus.Debug("creating parent layer link")
-			parentRef, err := CreateLayerLink(tempTargetRoot(), parentID)
+			parentRef, err := CreateLayerLink(tempTargetRoot(root), parentID)
 			if err != nil {
 				return fmt.Errorf("Error creating layer link dir for parent layer %s: %v", parentID, err)
 			}
@@ -189,7 +189,7 @@ func Migrate(root string) error {
 		logrus.Debug("hardlinking aufs data to overlay")
 		var (
 			overlayLayerDir = filepath.Join(layerDir, "diff")
-			aufsLayerDir    = filepath.Join(aufsRoot(), "diff", layer.ID)
+			aufsLayerDir    = filepath.Join(aufsRoot(root), "diff", layer.ID)
 		)
 		err = replicate(aufsLayerDir, overlayLayerDir)
 		if err != nil {
@@ -270,12 +270,12 @@ func Migrate(root string) error {
 	}
 
 	logrus.Info("moving layer data from temporary location to overlay2 root")
-	err = os.Rename(tempTargetRoot(), overlayRoot())
+	err = os.Rename(tempTargetRoot(root), overlayRoot(root))
 	if err != nil {
 		return fmt.Errorf("Error moving from temporary root: %v", err)
 	}
 
-	err = SwitchAllContainersStorageDriver("overlay2")
+	err = SwitchAllContainersStorageDriver(root, "overlay2")
 	if err != nil {
 		return fmt.Errorf("Error migrating containers to overlay2: %v", err)
 	}

pkg/storagemigration/overlayutils.go

@@ -19,7 +19,7 @@ var (
 )
 
 // CheckRootExists checks for the overlay storage root directory
-func CheckRootExists(engineDir string) error {
+func CheckOvlRootExists(engineDir string) error {
 	root := filepath.Join(engineDir, "overlay2")
 	logrus.WithField("overlay_root", root).Debug("checking if overlay2 root exists")
 	ok, err := exists(root, true)