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

daemon: getInspectData(): reduce cyclomatic complexity

Browse source 
Use an early return if looking up metadata fails.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2022-08-24 18:20:29 +02:00
parent 313a7d716d
commit 92d2e12a4d
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
daemon/inspect.go
View file

@ -197,17 +197,16 @@ func (daemon *Daemon) getInspectData(container *container.Container) (*types.Con
}
graphDriverData, err := container.RWLayer.Metadata()
// 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 {
if !container.Dead {
return nil, errdefs.System(err)
if container.Dead {
// container is marked as Dead, and its graphDriver metadata may
// have been removed; we can ignore errors.
return contJSONBase, nil
}
} else {
contJSONBase.GraphDriver.Data = graphDriverData
return nil, errdefs.System(err)
}
contJSONBase.GraphDriver.Data = graphDriverData
return contJSONBase, nil
}