feat: add dynamic timeout retry with file-size-based parameters #468
+1,276
−241
There are no files selected for viewing
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,14 +17,20 @@ | |
| package backend | ||
|
|
||
| import ( | ||
| legacymodelspec "github.com/dragonflyoss/model-spec/specs-go/v1" | ||
| modelspec "github.com/modelpack/model-spec/specs-go/v1" | ||
| ) | ||
|
|
||
| // getAnnotationFilepath returns the filepath stored on a descriptor's | ||
| // annotations, preferring the modelpack key and falling back to the legacy | ||
| // dragonflyoss key so older artifacts remain readable. Returns empty string | ||
| // when neither key is present. | ||
| func getAnnotationFilepath(annotations map[string]string) string { | ||
| if annotations == nil { | ||
| return "" | ||
| } | ||
| if path := annotations[modelspec.AnnotationFilepath]; path != "" { | ||
| return path | ||
| } | ||
| return annotations[legacymodelspec.AnnotationFilepath] | ||
| } | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,7 +23,6 @@ import ( | |
| "os" | ||
| "path/filepath" | ||
|
|
||
| modelspec "github.com/modelpack/model-spec/specs-go/v1" | ||
| ocispec "github.com/opencontainers/image-spec/specs-go/v1" | ||
| "github.com/sirupsen/logrus" | ||
|
|
@@ -35,6 +34,7 @@ import ( | |
| "github.com/modelpack/modctl/pkg/backend/processor" | ||
| "github.com/modelpack/modctl/pkg/config" | ||
| "github.com/modelpack/modctl/pkg/modelfile" | ||
| "github.com/modelpack/modctl/pkg/retrypolicy" | ||
| "github.com/modelpack/modctl/pkg/source" | ||
| ) | ||
|
|
||
|
|
@@ -123,8 +123,8 @@ func (b *backend) Build(ctx context.Context, modelfilePath, workDir, target stri | |
|
|
||
| var configDesc ocispec.Descriptor | ||
| // Build the model config. | ||
| if err := retrypolicy.Do(ctx, func(rctx context.Context) error { | ||
| configDesc, err = builder.BuildConfig(rctx, config, hooks.NewHooks( | ||
| hooks.WithOnStart(func(name string, size int64, reader io.Reader) io.Reader { | ||
| return pb.Add(internalpb.NormalizePrompt("Building config"), name, size, reader) | ||
| }), | ||
|
|
@@ -136,13 +136,17 @@ func (b *backend) Build(ctx context.Context, modelfilePath, workDir, target stri | |
| }), | ||
| )) | ||
| return err | ||
| }, retrypolicy.DoOpts{ | ||
| FileSize: 0, // config is small | ||
| FileName: "config", | ||
| Config: &cfg.RetryConfig, | ||
| }); err != nil { | ||
| return fmt.Errorf("failed to build model config: %w", err) | ||
| } | ||
|
|
||
| // Build the model manifest. | ||
| if err := retrypolicy.Do(ctx, func(rctx context.Context) error { | ||
| _, err = builder.BuildManifest(rctx, layers, configDesc, manifestAnnotation(modelfile), hooks.NewHooks( | ||
| hooks.WithOnStart(func(name string, size int64, reader io.Reader) io.Reader { | ||
| return pb.Add(internalpb.NormalizePrompt("Building manifest"), name, size, reader) | ||
| }), | ||
|
|
@@ -154,7 +158,11 @@ func (b *backend) Build(ctx context.Context, modelfilePath, workDir, target stri | |
| }), | ||
| )) | ||
| return err | ||
| }, retrypolicy.DoOpts{ | ||
| FileSize: 0, // manifest is small | ||
| FileName: "manifest", | ||
| Config: &cfg.RetryConfig, | ||
| }); err != nil { | ||
| return fmt.Errorf("failed to build model manifest: %w", err) | ||
| } | ||
|
|
||
|
|
@@ -204,7 +212,7 @@ func (b *backend) getProcessors(modelfile modelfile.Modelfile, cfg *config.Build | |
| func (b *backend) process(ctx context.Context, builder build.Builder, workDir string, pb *internalpb.ProgressBar, cfg *config.Build, processors ...processor.Processor) ([]ocispec.Descriptor, error) { | ||
| descriptors := []ocispec.Descriptor{} | ||
| for _, p := range processors { | ||
| descs, err := p.Process(ctx, builder, workDir, processor.WithConcurrency(cfg.Concurrency), processor.WithProgressTracker(pb), processor.WithRetryConfig(cfg.RetryConfig)) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,18 +19,20 @@ package backend | |
| import ( | ||
| "context" | ||
| "encoding/json" | ||
| "errors" | ||
| "fmt" | ||
| "sync" | ||
| "time" | ||
|
|
||
| "github.com/bmatcuk/doublestar/v4" | ||
| ocispec "github.com/opencontainers/image-spec/specs-go/v1" | ||
| "github.com/sirupsen/logrus" | ||
| "golang.org/x/sync/errgroup" | ||
|
|
||
| internalpb "github.com/modelpack/modctl/internal/pb" | ||
| "github.com/modelpack/modctl/pkg/backend/remote" | ||
| "github.com/modelpack/modctl/pkg/config" | ||
| "github.com/modelpack/modctl/pkg/retrypolicy" | ||
| ) | ||
|
|
||
| // Fetch fetches partial files to the output. | ||
|
|
@@ -74,10 +76,7 @@ func (b *backend) Fetch(ctx context.Context, target string, cfg *config.Fetch) e | |
| for _, layer := range manifest.Layers { | ||
| for _, pattern := range cfg.Patterns { | ||
| if anno := layer.Annotations; anno != nil { | ||
| path := getAnnotationFilepath(anno) | ||
| // Use doublestar.PathMatch for pattern matching to support ** recursive matching | ||
| // PathMatch uses the system's native path separator (like filepath.Match) while | ||
| // also supporting recursive patterns like **/*.json | ||
|
|
@@ -101,9 +100,12 @@ func (b *backend) Fetch(ctx context.Context, target string, cfg *config.Fetch) e | |
| pb.Start() | ||
| defer pb.Stop() | ||
|
|
||
| g := new(errgroup.Group) | ||
| g.SetLimit(cfg.Concurrency) | ||
|
|
||
| var mu sync.Mutex | ||
| var errs []error | ||
|
|
||
| logrus.Infof("fetch: fetching %d matched layers", len(layers)) | ||
| for _, layer := range layers { | ||
| g.Go(func() error { | ||
|
|
@@ -113,17 +115,38 @@ func (b *backend) Fetch(ctx context.Context, target string, cfg *config.Fetch) e | |
| default: | ||
| } | ||
|
|
||
| annoFilepath := getAnnotationFilepath(layer.Annotations) | ||
|
|
||
| logrus.Debugf("fetch: processing layer %s", layer.Digest) | ||
| if err := retrypolicy.Do(ctx, func(rctx context.Context) error { | ||
| return pullAndExtractFromRemote(rctx, pb, internalpb.NormalizePrompt("Fetching blob"), client, cfg.Output, layer) | ||
| }, retrypolicy.DoOpts{ | ||
| FileSize: layer.Size, | ||
| FileName: annoFilepath, | ||
| Config: &cfg.RetryConfig, | ||
| OnRetry: func(attempt uint, reason string, backoff time.Duration) { | ||
| if bar := pb.Get(layer.Digest.String()); bar != nil { | ||
| bar.SetRefill(bar.Current()) | ||
| bar.SetCurrent(0) | ||
| bar.EwmaSetCurrent(0, time.Second) | ||
| } | ||
| }, | ||
|
Comment on lines
+126
to
+132
There was a problem hiding this comment. Use the OnRetry: func(attempt uint, reason string, backoff time.Duration) {
pb.Placeholder(layer.Digest.String(), internalpb.NormalizePrompt("Fetching blob"), layer.Size)
}, |
||
| }); err != nil { | ||
| mu.Lock() | ||
| errs = append(errs, err) | ||
| mu.Unlock() | ||
| } else { | ||
| logrus.Debugf("fetch: successfully processed layer %s", layer.Digest) | ||
| } | ||
| return nil | ||
| }) | ||
| } | ||
|
|
||
| _ = g.Wait() | ||
| if ctx.Err() != nil { | ||
| return fmt.Errorf("fetch cancelled: %w", ctx.Err()) | ||
| } | ||
| if err := errors.Join(errs...); err != nil { | ||
| return err | ||
| } | ||
|
|
||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,18 +19,18 @@ package backend | |
| import ( | ||
| "context" | ||
| "encoding/json" | ||
| "errors" | ||
| "fmt" | ||
| "io" | ||
| "os" | ||
| "path/filepath" | ||
| "strings" | ||
| "sync" | ||
| "time" | ||
|
|
||
| common "d7y.io/api/v2/pkg/apis/common/v2" | ||
| dfdaemon "d7y.io/api/v2/pkg/apis/dfdaemon/v2" | ||
| "github.com/bmatcuk/doublestar/v4" | ||
| ocispec "github.com/opencontainers/image-spec/specs-go/v1" | ||
| "github.com/sirupsen/logrus" | ||
| "golang.org/x/sync/errgroup" | ||
|
|
@@ -41,6 +41,7 @@ import ( | |
| "github.com/modelpack/modctl/pkg/archiver" | ||
| "github.com/modelpack/modctl/pkg/backend/remote" | ||
| "github.com/modelpack/modctl/pkg/config" | ||
| "github.com/modelpack/modctl/pkg/retrypolicy" | ||
| ) | ||
|
|
||
| // fetchByDragonfly fetches partial files via Dragonfly gRPC service based on pattern matching. | ||
|
|
@@ -78,10 +79,7 @@ func (b *backend) fetchByDragonfly(ctx context.Context, target string, cfg *conf | |
| for _, layer := range manifest.Layers { | ||
| for _, pattern := range cfg.Patterns { | ||
| if anno := layer.Annotations; anno != nil { | ||
| path := getAnnotationFilepath(anno) | ||
| // Use doublestar.PathMatch for pattern matching to support ** recursive matching | ||
| // PathMatch uses the system's native path separator (like filepath.Match) while | ||
| // also supporting recursive patterns like **/*.json | ||
|
|
@@ -124,9 +122,12 @@ func (b *backend) fetchByDragonfly(ctx context.Context, target string, cfg *conf | |
| defer pb.Stop() | ||
|
|
||
| // Process layers concurrently. | ||
| g := new(errgroup.Group) | ||
| g.SetLimit(cfg.Concurrency) | ||
|
|
||
| var mu sync.Mutex | ||
| var errs []error | ||
|
|
||
| logrus.Infof("fetch: fetching %d matched layers via dragonfly", len(layers)) | ||
| for _, layer := range layers { | ||
| g.Go(func() error { | ||
|
|
@@ -138,14 +139,21 @@ func (b *backend) fetchByDragonfly(ctx context.Context, target string, cfg *conf | |
|
|
||
| logrus.Debugf("fetch: processing layer %s via dragonfly", layer.Digest) | ||
| if err := fetchLayerByDragonfly(ctx, pb, dfdaemon.NewDfdaemonDownloadClient(conn), ref, manifest, layer, authToken, cfg); err != nil { | ||
| mu.Lock() | ||
| errs = append(errs, err) | ||
| mu.Unlock() | ||
| } else { | ||
| logrus.Debugf("fetch: successfully processed layer %s via dragonfly", layer.Digest) | ||
| } | ||
| return nil | ||
| }) | ||
| } | ||
|
|
||
| _ = g.Wait() | ||
| if ctx.Err() != nil { | ||
| return fmt.Errorf("fetch cancelled: %w", ctx.Err()) | ||
| } | ||
| if err := errors.Join(errs...); err != nil { | ||
| return err | ||
| } | ||
|
|
||
|
|
@@ -155,18 +163,31 @@ func (b *backend) fetchByDragonfly(ctx context.Context, target string, cfg *conf | |
|
|
||
| // fetchLayerByDragonfly handles downloading and extracting a single layer via Dragonfly. | ||
| func fetchLayerByDragonfly(ctx context.Context, pb *internalpb.ProgressBar, client dfdaemon.DfdaemonDownloadClient, ref Referencer, manifest ocispec.Manifest, desc ocispec.Descriptor, authToken string, cfg *config.Fetch) error { | ||
| annoFilepath := getAnnotationFilepath(desc.Annotations) | ||
|
|
||
| err := retrypolicy.Do(ctx, func(rctx context.Context) error { | ||
| logrus.Debugf("fetch: processing layer %s", desc.Digest) | ||
| cfg.Hooks.BeforePullLayer(desc, manifest) // Call before hook | ||
| err := downloadAndExtractFetchLayer(rctx, pb, client, ref, desc, authToken, cfg) | ||
| cfg.Hooks.AfterPullLayer(desc, err) // Call after hook | ||
| if err != nil { | ||
| err = fmt.Errorf("pull: failed to download and extract layer %s: %w", desc.Digest, err) | ||
| logrus.Error(err) | ||
| } | ||
|
|
||
| return err | ||
| }, retrypolicy.DoOpts{ | ||
| FileSize: desc.Size, | ||
| FileName: annoFilepath, | ||
| Config: &cfg.RetryConfig, | ||
| OnRetry: func(attempt uint, reason string, backoff time.Duration) { | ||
| if bar := pb.Get(desc.Digest.String()); bar != nil { | ||
| bar.SetRefill(bar.Current()) | ||
| bar.SetCurrent(0) | ||
| bar.EwmaSetCurrent(0, time.Second) | ||
| } | ||
| }, | ||
|
Comment on lines
+182
to
+188
There was a problem hiding this comment. Use the OnRetry: func(attempt uint, reason string, backoff time.Duration) {
pb.Placeholder(desc.Digest.String(), internalpb.NormalizePrompt("Fetching blob"), desc.Size)
}, |
||
| }) | ||
|
|
||
| if err != nil { | ||
| err = fmt.Errorf("fetch: failed to download and extract layer %s: %w", desc.Digest, err) | ||
|
|
@@ -184,14 +205,7 @@ func downloadAndExtractFetchLayer(ctx context.Context, pb *internalpb.ProgressBa | |
| return fmt.Errorf("failed to resolve output dir: %w", err) | ||
| } | ||
|
|
||
| annoFilepath := getAnnotationFilepath(desc.Annotations) | ||
|
|
||
| if annoFilepath == "" { | ||
| return fmt.Errorf("missing annotation filepath") | ||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
Placeholdermethod should encapsulate the full reset logic used during retries, including setting the refill value and resetting the EWMA speed calculation. This ensures consistency across different transfer paths and avoids manual bar manipulation in the backend packages.