Fix reference ordering in CRI image store #5250
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Currently image references end up being stored in a random order due to the way maps are iterated through in Go. This leads to inconsistent identifiers being resolved when a single reference is needed to identify an image and the ordering of the references is used for the selection. Sort references in a consistent and ranked manner, from higher information formats to lower. Note: A `name + tag` reference is considered higher information than a `name + digest` reference since a registry may be used to resolve the digest from a `name + tag` reference. Signed-off-by: Derek McGowan <derek@mcg.dev>
|
I think the ordering makes sense the way you have it. |
mxpv
approved these changes
Mar 23, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently image references end up being stored in a
random order due to the way maps are iterated through
in Go. This leads to inconsistent identifiers being
resolved when a single reference is needed to identify
an image and the ordering of the references is used for
the selection.
Sort references in a consistent and ranked manner,
from higher information formats to lower.
Note: A
name + tagreference is considered higherinformation than a
name + digestreference since aregistry may be used to resolve the digest from a
name + tagreference.Original Issue:
References is created using https://github.com/containerd/containerd/blob/master/pkg/cri/util/strings.go#L46 which does not guarantee any order
The first item of this array then gets used to set the image name when creating a container at https://github.com/containerd/containerd/blob/master/pkg/cri/server/container_create.go#L158