nydusify: fix the issue of blob not found when modifying image name d… #1673
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
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #1673 +/- ##
==========================================
- Coverage 60.42% 60.41% -0.01%
==========================================
Files 146 146
Lines 48943 48943
Branches 46380 46380
==========================================
- Hits 29573 29571 -2
- Misses 17906 17907 +1
- Partials 1464 1465 +1 |
|
@ymydb Plz add the SOB in your commit to pass the DCO check. :) And also fix the lint check in https://github.com/dragonflyoss/nydus/actions/runs/13630416687/job/38170584022?pr=1673 (this seems unrelated to your PR, maybe help to fix it if you're interested, it's not a merge blocker. :)) |
606e15a to
ad38596
Compare
…uring commit Signed-off-by: ymy <ymy@zetyun.com>
Signed-off-by: ymy <ymy@zetyun.com>
|
@imeoer It looks all right. Please review it for me |
BraveY
reviewed
Mar 6, 2025
| @@ -107,6 +112,18 @@ func (cm *Committer) Commit(ctx context.Context, opt Opt) error { | |||
| return errors.Wrap(err, "obtain bootstrap FsVersion and Compressor") | |||
| } | |||
|
|
|||
| // Push lower blobs | |||
| for idx := range image.Manifest.Layers { | |||
There was a problem hiding this comment.
How about
for idx, layer := range image.Manifest.Layers {
BraveY
reviewed
Mar 6, 2025
| layer := image.Manifest.Layers[idx] | ||
| if layer.MediaType == utils.MediaTypeNydusBlob { | ||
| name := fmt.Sprintf("blob-mount-%d", idx) | ||
| _, err := cm.pushBlob(ctx, name, layer.Digest, originalSourceRef, targetRef, opt.TargetInsecure, image) |
There was a problem hiding this comment.
How about
if _, err := cm.pushBlob(ctx, name, layer.Digest, originalSourceRef, targetRef, opt.TargetInsecure, image); err != nil {
return errors.Wrap(err, "push lower blob")
}
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.
Details
There are some bugs in nydusify commit image, following bugs are fixed in this:
Use the mount blob api in the same repository
Types of changes
What types of changes does your PullRequest introduce? Put an
xin all the boxes that apply:Checklist
Go over all the following points, and put an
xin all the boxes that apply.