USEFULL
/
gitea
mirror of https://github.com/go-gitea/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove context from retry downloader (#33871) 

follow up to https://github.com/go-gitea/gitea/pull/33399 as I
apparently missed this one.
pull/33744/head^2
TheFox0x7 2025-03-14 01:28:57 +01:00 committed by GitHub
parent d879ec6d92
commit 5d65b9060b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
modules/migration/retry_downloader.go
View File

@ -13,36 +13,34 @@ var _ Downloader = &RetryDownloader{}
// RetryDownloader retry the downloads // RetryDownloader retry the downloads
type RetryDownloader struct { type RetryDownloader struct {
Downloader Downloader
ctx context.Context
RetryTimes int // the total execute times RetryTimes int // the total execute times
RetryDelay int // time to delay seconds RetryDelay int // time to delay seconds
} }
// NewRetryDownloader creates a retry downloader // NewRetryDownloader creates a retry downloader
func NewRetryDownloader(ctx context.Context, downloader Downloader, retryTimes, retryDelay int) *RetryDownloader { func NewRetryDownloader(downloader Downloader, retryTimes, retryDelay int) *RetryDownloader {
return &RetryDownloader{ return &RetryDownloader{
Downloader: downloader, Downloader: downloader,
ctx: ctx,
RetryTimes: retryTimes, RetryTimes: retryTimes,
RetryDelay: retryDelay, RetryDelay: retryDelay,
} }
} }
func (d *RetryDownloader) retry(work func() error) error { func (d *RetryDownloader) retry(ctx context.Context, work func(context.Context) error) error {
var ( var (
times = d.RetryTimes times = d.RetryTimes
err error err error
) )
for ; times > 0; times-- { for ; times > 0; times-- {
if err = work(); err == nil { if err = work(ctx); err == nil {
return nil return nil
} }
if IsErrNotSupported(err) { if IsErrNotSupported(err) {
return err return err
} }
select { select {
case <-d.ctx.Done(): case <-ctx.Done():
return d.ctx.Err() return ctx.Err()
case <-time.After(time.Second * time.Duration(d.RetryDelay)): case <-time.After(time.Second * time.Duration(d.RetryDelay)):
} }
} }
@ -56,7 +54,7 @@ func (d *RetryDownloader) GetRepoInfo(ctx context.Context) (*Repository, error)
err error err error
) )
err = d.retry(func() error { err = d.retry(ctx, func(ctx context.Context) error {
repo, err = d.Downloader.GetRepoInfo(ctx) repo, err = d.Downloader.GetRepoInfo(ctx)
return err return err
}) })
@ -71,7 +69,7 @@ func (d *RetryDownloader) GetTopics(ctx context.Context) ([]string, error) {
err error err error
) )
err = d.retry(func() error { err = d.retry(ctx, func(ctx context.Context) error {
topics, err = d.Downloader.GetTopics(ctx) topics, err = d.Downloader.GetTopics(ctx)
return err return err
}) })
@ -86,7 +84,7 @@ func (d *RetryDownloader) GetMilestones(ctx context.Context) ([]*Milestone, erro
err error err error
) )
err = d.retry(func() error { err = d.retry(ctx, func(ctx context.Context) error {
milestones, err = d.Downloader.GetMilestones(ctx) milestones, err = d.Downloader.GetMilestones(ctx)
return err return err
}) })
@ -101,7 +99,7 @@ func (d *RetryDownloader) GetReleases(ctx context.Context) ([]*Release, error) {
err error err error
) )
err = d.retry(func() error { err = d.retry(ctx, func(ctx context.Context) error {
releases, err = d.Downloader.GetReleases(ctx) releases, err = d.Downloader.GetReleases(ctx)
return err return err
}) })
@ -116,7 +114,7 @@ func (d *RetryDownloader) GetLabels(ctx context.Context) ([]*Label, error) {
err error err error
) )
err = d.retry(func() error { err = d.retry(ctx, func(ctx context.Context) error {
labels, err = d.Downloader.GetLabels(ctx) labels, err = d.Downloader.GetLabels(ctx)
return err return err
}) })
@ -132,7 +130,7 @@ func (d *RetryDownloader) GetIssues(ctx context.Context, page, perPage int) ([]*
err error err error
) )
err = d.retry(func() error { err = d.retry(ctx, func(ctx context.Context) error {
issues, isEnd, err = d.Downloader.GetIssues(ctx, page, perPage) issues, isEnd, err = d.Downloader.GetIssues(ctx, page, perPage)
return err return err
}) })
@ -148,7 +146,7 @@ func (d *RetryDownloader) GetComments(ctx context.Context, commentable Commentab
err error err error
) )
err = d.retry(func() error { err = d.retry(ctx, func(context.Context) error {
comments, isEnd, err = d.Downloader.GetComments(ctx, commentable) comments, isEnd, err = d.Downloader.GetComments(ctx, commentable)
return err return err
}) })
@ -164,7 +162,7 @@ func (d *RetryDownloader) GetPullRequests(ctx context.Context, page, perPage int
isEnd bool isEnd bool
) )
err = d.retry(func() error { err = d.retry(ctx, func(ctx context.Context) error {
prs, isEnd, err = d.Downloader.GetPullRequests(ctx, page, perPage) prs, isEnd, err = d.Downloader.GetPullRequests(ctx, page, perPage)
return err return err
}) })
@ -178,7 +176,7 @@ func (d *RetryDownloader) GetReviews(ctx context.Context, reviewable Reviewable)
reviews []*Review reviews []*Review
err error err error
) )
err = d.retry(func() error { err = d.retry(ctx, func(ctx context.Context) error {
reviews, err = d.Downloader.GetReviews(ctx, reviewable) reviews, err = d.Downloader.GetReviews(ctx, reviewable)
return err return err
}) })

2
services/migrations/migrate.go
View File

@ -168,7 +168,7 @@ func newDownloader(ctx context.Context, ownerName string, opts base.MigrateOptio
} }
if setting.Migrations.MaxAttempts > 1 { if setting.Migrations.MaxAttempts > 1 {
downloader = base.NewRetryDownloader(ctx, downloader, setting.Migrations.MaxAttempts, setting.Migrations.RetryBackoff) downloader = base.NewRetryDownloader(downloader, setting.Migrations.MaxAttempts, setting.Migrations.RetryBackoff)
} }
return downloader, nil return downloader, nil
} }