p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed migrate defect, allow migrate the empty directory

Browse Source 
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 <andy.zhangtao@hotmail.com>

Change error messages from uppercase to lowercase

Change error messages from uppercase to lowercase

Signed-off-by: andy <ztao@tibco-support.com>
Upstream-commit: 098fdb6408e4e630c1c78b8283c4bc716cc46698
Component: engine
This commit is contained in:
andy
2016-01-08 08:32:32 +08:00
committed by Michael Crosby
parent f22c8d297c
commit 8912ced795
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/engine/migrate/v1/migratev1.go
View File

@ -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