Skip to content

fix(processor): correct error handling and annotations logic #341

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
aftersnow merged 1 commit into from
Nov 26, 2025
+20 −9
Merged

fix(processor): correct error handling and annotations logic #341

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
29 changes: 20 additions & 9 deletions pkg/backend/processor/base.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,13 @@ func (b *base) Process(ctx context.Context, builder build.Builder, workDir strin
}

eg.Go(func() error {
return retry.Do(func() error {
select {
case <-ctx.Done():
return ctx.Err()
default:
}

if err := retry.Do(func() error {
logrus.Debugf("processor: processing %s file %s", b.name, path)

desc, err := builder.BuildLayer(ctx, b.mediaType, workDir, path, hooks.NewHooks(
Expand All @@ -146,10 +152,7 @@ func (b *base) Process(ctx context.Context, builder build.Builder, workDir strin
}),
))
if err != nil {
err = fmt.Errorf("processor: failed to build layer for %s file %s: %w", b.name, path, err)
logrus.Error(err)
cancel()
return err
return fmt.Errorf("processor: failed to build layer for %s file %s: %w", b.name, path, err)
}

logrus.Debugf("processor: successfully built %s layer for file %s [digest: %s, size: %d]", b.name, path, desc.Digest, desc.Size)
Expand All @@ -158,7 +161,15 @@ func (b *base) Process(ctx context.Context, builder build.Builder, workDir strin
mu.Unlock()

return nil
}, append(defaultRetryOpts, retry.Context(ctx))...)
}, append(defaultRetryOpts, retry.Context(ctx))...); err != nil {
logrus.Error(err)
// Cancel manually to abort other tasks because if one fails,
// we should abort all to avoid useless waiting.
cancel()
return err
}

return nil
})
}

Expand All @@ -180,10 +191,10 @@ func (b *base) Process(ctx context.Context, builder build.Builder, workDir strin
}

if descriptors[j].Annotations != nil {
if descriptors[i].Annotations[modelspec.AnnotationFilepath] != "" {
pathJ = descriptors[i].Annotations[modelspec.AnnotationFilepath]
if descriptors[j].Annotations[modelspec.AnnotationFilepath] != "" {
pathJ = descriptors[j].Annotations[modelspec.AnnotationFilepath]
} else {
pathJ = descriptors[i].Annotations[legacymodelspec.AnnotationFilepath]
pathJ = descriptors[j].Annotations[legacymodelspec.AnnotationFilepath]
}
}

Expand Down