nydusify: add fs-version annotation #497
Merged
Conversation
This file contains 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
yawqi
changed the title
yawqi
force-pushed
the
annotaion
branch
3 times, most recently
from
ae23437
to
8a7c54a
Compare
yawqi
changed the title
imeoer
reviewed
Jun 15, 2022
contrib/nydusify/pkg/cache/cache.go
Outdated
| @@ -129,6 +129,7 @@ func (cache *Cache) recordToLayer(record *Record) (*ocispec.Descriptor, *ocispec | |||
| Size: record.NydusBootstrapDesc.Size, | |||
| Annotations: map[string]string{ | |||
| utils.LayerAnnotationNydusBootstrap: "true", | |||
| utils.LayerAnnotationNydusFsVersion: cache.opt.Version, | |||
There was a problem hiding this comment.
Should be cache.opt.FsVersion, how this option be passed to the cache image?
There was a problem hiding this comment.
I checked, it is cache.opt.Version.
There was a problem hiding this comment.
// Opt configures Nydus cache
type Opt struct {
// Maximum records(bootstrap layer + blob layer) in cache image.
MaxRecords uint
Version string
// Make cache image manifest compatible with the docker v2 media
// type defined in github.com/containerd/containerd/images.
DockerV2Format bool
// The blob layer record will not be written to cache image if
// the backend be specified, because the blob layer will be uploaded
// to backend.
Backend backend.Backend
}
There was a problem hiding this comment.
I have tested on converting alpine:latest with nydusify for both v5 and v6, and checked their manifests.
There was a problem hiding this comment.
@yawqi This Version field is used to indicate the version of cache image (not fs version), nydusify will use cache records depending on the version. :)
There was a problem hiding this comment.
We can add some comments to distinguish these two fields:
// Opt configures Nydus cache
type Opt struct {
...
// Version of cache image, we need to discard cache layers when
// the required version (specified by `--build-cache-version`)
// is unmatched with the cache image version, for example nydus
// bootstrap format has a minor upgrade.
Version string
// Bootstrap's RAFS version of cache image, we need to discard cache
// layers when the required version (specified by `--fs-version`) is
// unmatched with the fs version recorded in cache image, for example
// we can't use rafs v5 cache layers for rafs v6 image.
FsVersion string
...
}
yawqi
force-pushed
the
annotaion
branch
2 times, most recently
from
96f4878
to
1999069
Compare
imeoer
reviewed
Jun 16, 2022
contrib/nydusify/pkg/cache/cache.go
Outdated
| // Discard the cache if mismatched RAFS FsVersion | ||
| if manifest.Annotations[utils.LayerAnnotationNydusFsVersion] != cache.opt.FsVersion { | ||
| return fmt.Errorf( | ||
| "unmatched cache image version %s, required to be %s", |
There was a problem hiding this comment.
Maybe unmatched fs version %s of cache image, required to be %s.
imeoer
reviewed
Jun 16, 2022
contrib/nydusify/pkg/cache/cache.go
Outdated
| if manifest.Annotations[utils.ManifestNydusCache] != cache.opt.Version { | ||
| return fmt.Errorf( | ||
| "unmatched cache image version %s, required to be %s", | ||
| manifest.Annotations[utils.ManifestNydusCache], cache.opt.Version, | ||
| ) | ||
| } | ||
|
|
||
| // Discard the cache if mismatched RAFS FsVersion | ||
| if manifest.Annotations[utils.LayerAnnotationNydusFsVersion] != cache.opt.FsVersion { |
There was a problem hiding this comment.
For manifest.Annotations[utils.LayerAnnotationNydusFsVersion] == "" (e.g. old cache image), we should consider it as 5.
Add an annotation to the image manifest for detecting the bootstrap fs version without reading the magic number from bootstrap. fix dragonflyoss#496 Signed-off-by: Qi Wang <wangqi@linux.alibaba.com>
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.
Add an annotation to the image manifest for detecting the bootstrap fs
version without reading the magic number from bootstrap.
fix #496
Signed-off-by: Qi Wang wangqi@linux.alibaba.com