mirror of
https://github.com/containers/podman.git
synced 2026-01-31 01:11:49 -05:00
The initial version of libimage changed the order of layers which has now been restored to remain backwards compatible. Further changes: * Fix a bug in the journald logging which requires to strip trailing new lines from the message. The system tests did not pass due to empty new lines. Triggered by changing the default logger to journald in containers/common. * Fix another bug in the journald logging which embedded the container ID inside the message rather than the specifid field. That surfaced in a preceeding whitespace of each log line which broke the system tests. * Alter the system tests to make sure that the k8s-file and the journald logging drivers are executed. * A number of e2e tests have been changed to force the k8s-file driver to make them pass when running inside a root container. * Increase the timeout in a kill test which seems to take longer now. Reasons are unknown. Tests passed earlier and no signal-related changes happend. It may be CI VM flake since some system tests but other flaked. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
250 lines
6.6 KiB
Go
250 lines
6.6 KiB
Go
package libimage
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/containers/storage"
|
|
ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
|
|
"github.com/sirupsen/logrus"
|
|
)
|
|
|
|
// layerTree is an internal representation of local layers.
|
|
type layerTree struct {
|
|
// nodes is the actual layer tree with layer IDs being keys.
|
|
nodes map[string]*layerNode
|
|
// ociCache is a cache for Image.ID -> OCI Image. Translations are done
|
|
// on-demand.
|
|
ociCache map[string]*ociv1.Image
|
|
}
|
|
|
|
// node returns a layerNode for the specified layerID.
|
|
func (t *layerTree) node(layerID string) *layerNode {
|
|
node, exists := t.nodes[layerID]
|
|
if !exists {
|
|
node = &layerNode{}
|
|
t.nodes[layerID] = node
|
|
}
|
|
return node
|
|
}
|
|
|
|
// toOCI returns an OCI image for the specified image.
|
|
func (t *layerTree) toOCI(ctx context.Context, i *Image) (*ociv1.Image, error) {
|
|
var err error
|
|
oci, exists := t.ociCache[i.ID()]
|
|
if !exists {
|
|
oci, err = i.toOCI(ctx)
|
|
if err == nil {
|
|
t.ociCache[i.ID()] = oci
|
|
}
|
|
}
|
|
return oci, err
|
|
}
|
|
|
|
// layerNode is a node in a layerTree. It's ID is the key in a layerTree.
|
|
type layerNode struct {
|
|
children []*layerNode
|
|
images []*Image
|
|
parent *layerNode
|
|
layer *storage.Layer
|
|
}
|
|
|
|
// repoTags assemble all repo tags all of images of the layer node.
|
|
func (l *layerNode) repoTags() ([]string, error) {
|
|
orderedTags := []string{}
|
|
visitedTags := make(map[string]bool)
|
|
|
|
for _, image := range l.images {
|
|
repoTags, err := image.RepoTags()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
for _, tag := range repoTags {
|
|
if _, visited := visitedTags[tag]; visited {
|
|
continue
|
|
}
|
|
visitedTags[tag] = true
|
|
orderedTags = append(orderedTags, tag)
|
|
}
|
|
}
|
|
|
|
return orderedTags, nil
|
|
}
|
|
|
|
// layerTree extracts a layerTree from the layers in the local storage and
|
|
// relates them to the specified images.
|
|
func (r *Runtime) layerTree() (*layerTree, error) {
|
|
layers, err := r.store.Layers()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
images, err := r.ListImages(context.Background(), nil, nil)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
tree := layerTree{
|
|
nodes: make(map[string]*layerNode),
|
|
ociCache: make(map[string]*ociv1.Image),
|
|
}
|
|
|
|
// First build a tree purely based on layer information.
|
|
for i := range layers {
|
|
node := tree.node(layers[i].ID)
|
|
node.layer = &layers[i]
|
|
if layers[i].Parent == "" {
|
|
continue
|
|
}
|
|
parent := tree.node(layers[i].Parent)
|
|
node.parent = parent
|
|
parent.children = append(parent.children, node)
|
|
}
|
|
|
|
// Now assign the images to each (top) layer.
|
|
for i := range images {
|
|
img := images[i] // do not leak loop variable outside the scope
|
|
topLayer := img.TopLayer()
|
|
if topLayer == "" {
|
|
continue
|
|
}
|
|
node, exists := tree.nodes[topLayer]
|
|
if !exists {
|
|
// Note: erroring out in this case has turned out having been a
|
|
// mistake. Users may not be able to recover, so we're now
|
|
// throwing a warning to guide them to resolve the issue and
|
|
// turn the errors non-fatal.
|
|
logrus.Warnf("Top layer %s of image %s not found in layer tree. The storage may be corrupted, consider running `podman system reset`.", topLayer, img.ID())
|
|
continue
|
|
}
|
|
node.images = append(node.images, img)
|
|
}
|
|
|
|
return &tree, nil
|
|
}
|
|
|
|
// children returns the child images of parent. Child images are images with
|
|
// either the same top layer as parent or parent being the true parent layer.
|
|
// Furthermore, the history of the parent and child images must match with the
|
|
// parent having one history item less. If all is true, all images are
|
|
// returned. Otherwise, the first image is returned.
|
|
func (t *layerTree) children(ctx context.Context, parent *Image, all bool) ([]*Image, error) {
|
|
if parent.TopLayer() == "" {
|
|
return nil, nil
|
|
}
|
|
|
|
var children []*Image
|
|
|
|
parentNode, exists := t.nodes[parent.TopLayer()]
|
|
if !exists {
|
|
// Note: erroring out in this case has turned out having been a
|
|
// mistake. Users may not be able to recover, so we're now
|
|
// throwing a warning to guide them to resolve the issue and
|
|
// turn the errors non-fatal.
|
|
logrus.Warnf("Layer %s not found in layer tree. The storage may be corrupted, consider running `podman system reset`.", parent.TopLayer())
|
|
return children, nil
|
|
}
|
|
|
|
parentID := parent.ID()
|
|
parentOCI, err := t.toOCI(ctx, parent)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// checkParent returns true if child and parent are in such a relation.
|
|
checkParent := func(child *Image) (bool, error) {
|
|
if parentID == child.ID() {
|
|
return false, nil
|
|
}
|
|
childOCI, err := t.toOCI(ctx, child)
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
// History check.
|
|
return areParentAndChild(parentOCI, childOCI), nil
|
|
}
|
|
|
|
// addChildrenFrom adds child images of parent to children. Returns
|
|
// true if any image is a child of parent.
|
|
addChildrenFromNode := func(node *layerNode) (bool, error) {
|
|
foundChildren := false
|
|
for i, childImage := range node.images {
|
|
isChild, err := checkParent(childImage)
|
|
if err != nil {
|
|
return foundChildren, err
|
|
}
|
|
if isChild {
|
|
foundChildren = true
|
|
children = append(children, node.images[i])
|
|
if all {
|
|
return foundChildren, nil
|
|
}
|
|
}
|
|
}
|
|
return foundChildren, nil
|
|
}
|
|
|
|
// First check images where parent's top layer is also the parent
|
|
// layer.
|
|
for _, childNode := range parentNode.children {
|
|
found, err := addChildrenFromNode(childNode)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if found && all {
|
|
return children, nil
|
|
}
|
|
}
|
|
|
|
// Now check images with the same top layer.
|
|
if _, err := addChildrenFromNode(parentNode); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return children, nil
|
|
}
|
|
|
|
// parent returns the parent image or nil if no parent image could be found.
|
|
func (t *layerTree) parent(ctx context.Context, child *Image) (*Image, error) {
|
|
if child.TopLayer() == "" {
|
|
return nil, nil
|
|
}
|
|
|
|
node, exists := t.nodes[child.TopLayer()]
|
|
if !exists {
|
|
// Note: erroring out in this case has turned out having been a
|
|
// mistake. Users may not be able to recover, so we're now
|
|
// throwing a warning to guide them to resolve the issue and
|
|
// turn the errors non-fatal.
|
|
logrus.Warnf("Layer %s not found in layer tree. The storage may be corrupted, consider running `podman system reset`.", child.TopLayer())
|
|
return nil, nil
|
|
}
|
|
|
|
childOCI, err := t.toOCI(ctx, child)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// Check images from the parent node (i.e., parent layer) and images
|
|
// with the same layer (i.e., same top layer).
|
|
childID := child.ID()
|
|
images := node.images
|
|
if node.parent != nil {
|
|
images = append(images, node.parent.images...)
|
|
}
|
|
for _, parent := range images {
|
|
if parent.ID() == childID {
|
|
continue
|
|
}
|
|
parentOCI, err := t.toOCI(ctx, parent)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
// History check.
|
|
if areParentAndChild(parentOCI, childOCI) {
|
|
return parent, nil
|
|
}
|
|
}
|
|
|
|
return nil, nil
|
|
}
|