Skip to content

drivers/multi: fix error propagation #771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SuperSandro2000 merged 1 commit into from
Aug 10, 2026
+8 −8
Merged

drivers/multi: fix error propagation #771

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions internal/drivers/multi/storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,11 +279,11 @@ func (d *StorageDriver) ReadBlobForValidation(ctx context.Context, account model
}

// delete blob only one we know it exists on the new side
err = d.oldDriver.DeleteBlob(ctx, account, storageID)
if err != nil && !errors.Is(err, keppel.NotFoundInStorageError{}) {
return nil, 0, errext.WithCleanup(err, "Reader.Close", reader.Close())
errOnOldSide := d.oldDriver.DeleteBlob(ctx, account, storageID)
if errOnOldSide != nil && !errors.Is(errOnOldSide, keppel.NotFoundInStorageError{}) {
return nil, 0, errext.WithCleanup(errOnOldSide, "Reader.Close", reader.Close())
}
if err == nil {
if errOnOldSide == nil {
cleanedUpCounter.With(prometheus.Labels{"type": "blobs"}).Inc()
}

Expand Down Expand Up @@ -390,11 +390,11 @@ func (d *StorageDriver) ReadManifestForValidation(ctx context.Context, account m
}

// delete manifest only one we know it exists on the new side
err = d.oldDriver.DeleteManifest(ctx, account, repoName, manifestDigest)
if err != nil && !errors.Is(err, keppel.NotFoundInStorageError{}) {
return nil, err
errOnOldSide := d.oldDriver.DeleteManifest(ctx, account, repoName, manifestDigest)
if errOnOldSide != nil && !errors.Is(errOnOldSide, keppel.NotFoundInStorageError{}) {
return nil, errOnOldSide
}
Comment thread
majewsky marked this conversation as resolved.
if err == nil {
if errOnOldSide == nil {
cleanedUpCounter.With(prometheus.Labels{"type": "manifests"}).Inc()
}

Expand Down