beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #29459 from yongtang/29365-follow-up

Browse source 
Allow containers to continue even if mount failed after live restore
This commit is contained in:
Sebastiaan van Stijn 2016-12-17 01:46:25 +01:00 committed by GitHub
commit 110a95717d
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
daemon/daemon.go
View file

@ -150,8 +150,13 @@ func (daemon *Daemon) restore() error {
}
container.RWLayer = rwlayer
if err := daemon.Mount(container); err != nil {
logrus.Errorf("Failed to mount container %v: %v", id, err)
continue
// The mount is unlikely to fail. However, in case mount fails
// the container should be allowed to restore here. Some functionalities
// (like docker exec -u user) might be missing but container is able to be
// stopped/restarted/removed.
// See #29365 for related information.
// The error is only logged here.
logrus.Warnf("Failed to mount container %v: %v", id, err)
}
logrus.Debugf("Loaded container %v", container.ID)