From 098fdb6408e4e630c1c78b8283c4bc716cc46698 Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 8 Jan 2016 08:32:32 +0800 Subject: [PATCH] Fixed migrate defect, allow migrate the empty directory If there is an empty directory exists in the $DOCKER_ROOT/containers , that will cause migrate fail. Then docker daemon will initialize failed. This commit allow skips the empty directory. Signed-off-by: Andy Zhang Change error messages from uppercase to lowercase Change error messages from uppercase to lowercase Signed-off-by: andy --- migrate/v1/migratev1.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/migrate/v1/migratev1.go b/migrate/v1/migratev1.go index d28287a1c2..77507c3dd4 100644 --- a/migrate/v1/migratev1.go +++ b/migrate/v1/migratev1.go @@ -238,12 +238,14 @@ func migrateContainers(root string, ls graphIDMounter, is image.Store, imageMapp containerJSON, err := ioutil.ReadFile(filepath.Join(containersDir, id, configFileNameLegacy)) if err != nil { - return err + logrus.Errorf("migrate container error: %v", err) + continue } var c map[string]*json.RawMessage if err := json.Unmarshal(containerJSON, &c); err != nil { - return err + logrus.Errorf("migrate container error: %v", err) + continue } imageStrJSON, ok := c["Image"] @@ -253,8 +255,10 @@ func migrateContainers(root string, ls graphIDMounter, is image.Store, imageMapp var image string if err := json.Unmarshal([]byte(*imageStrJSON), &image); err != nil { - return err + logrus.Errorf("migrate container error: %v", err) + continue } + imageID, ok := imageMappings[image] if !ok { logrus.Errorf("image not migrated %v", imageID) // non-fatal error