Fix inspect Dead container

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: c35186b0b906dbda224d94c37794022762fcb374
Component: engine
This commit is contained in:
Lei Jitang
2016-08-22 22:09:25 -04:00
parent 968533071a
commit 1003bf4b18
+4 -1
View File
@@ -167,7 +167,10 @@ func (daemon *Daemon) getInspectData(container *container.Container, size bool)
contJSONBase.GraphDriver.Name = container.Driver
graphDriverData, err := container.RWLayer.Metadata()
if err != nil {
// If container is marked as Dead, the container's graphdriver metadata
// could have been removed, it will cause error if we try to get the metadata,
// we can ignore the error if the container is dead.
if err != nil && !container.Dead {
return nil, err
}
contJSONBase.GraphDriver.Data = graphDriverData