Fix some bugs in image conversion #193
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
imeoer
reviewed
Sep 28, 2022
| return nil, errors.Wrap(err, "read target image index json") | ||
| } | ||
| // isManifestModified is a function to check whether the manifest is modified. | ||
| isManifestModified := func(manifest ocispec.Descriptor) bool { |
There was a problem hiding this comment.
Maybe we can check whether it is nydus manifest (name it isNydusManifest) by recognizing bootstrap annotation, which would be safer?
There was a problem hiding this comment.
Then we need to read json from the content store for each manifest descriptor.
There was a problem hiding this comment.
Maybe we can store the modified manifest digest in a map in the manifest conversion hook?
There was a problem hiding this comment.
Well, just checking if the manifest is changed should also work.
e26e440 to
df536dc
Compare
imeoer
reviewed
Sep 28, 2022
df536dc to
f310f09
Compare
imeoer
approved these changes
Sep 28, 2022
|
@imeoer Can you please rerun the action? There may be a network error. Thanks :) |
|
/retest |
|
The current main branch has Golang race problem, which fails this PR. I will fix it |
|
Please rebase to the latest main branch. |
…rtHookFunc`. 1. append `nydus.remoteimage.v1` to `os.features` of the manifest descriptor in the index 2. add `"containerd.io/snapshot/nydus-blob": "true"` to the annotations of the blob layer descriptor in the manifest 3. avoid appending duplicate bootstrap layer digest to the diffID list of the config This commit also adds a smoke test `TestContainerdImageConvert` to make sure `LayerConvertFunc` and `ConvertHookFunc` work well with the containerd image conversion library. Signed-off-by: Nan Li <loheagn@icloud.com>
f310f09 to
528734c
Compare
imeoer
approved these changes
Sep 28, 2022
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.
This patch fixes some bugs in image conversion using
LayerConvertFuncandConvertHookFunc.nydus.remoteimage.v1toos.featuresof the manifest descriptor in the index"containerd.io/snapshot/nydus-blob": "true"to the annotations of the blob layer descriptor in the manifestThis patch also adds a smoke test
TestContainerdImageConvertto make sureLayerConvertFuncandConvertHookFuncwork well with the containerd image conversion library.Signed-off-by: Nan Li loheagn@icloud.com