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

Daemon: do GetRWLayer after checking if container use the current graph driver

Browse Source 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 899f1b18707d035a1dca73cae0dd7b3bfe65c046
Component: engine
This commit is contained in:
Lei Jitang
2016-01-26 20:20:30 -05:00
parent 531573357d
commit c0b7e34886
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
components/engine/daemon/daemon.go
View File

@ -277,15 +277,14 @@ func (daemon *Daemon) restore() error {
continue
}
rwlayer, err := daemon.layerStore.GetRWLayer(container.ID)
if err != nil {
logrus.Errorf("Failed to load container mount %v: %v", id, err)
continue
}
container.RWLayer = rwlayer
// Ignore the container if it does not support the current driver being used by the graph
if (container.Driver == "" && currentDriver == "aufs") || container.Driver == currentDriver {
rwlayer, err := daemon.layerStore.GetRWLayer(container.ID)
if err != nil {
logrus.Errorf("Failed to load container mount %v: %v", id, err)
continue
}
container.RWLayer = rwlayer
logrus.Debugf("Loaded container %v", container.ID)
containers[container.ID] = container