diff options
| author | zeripath <art27@cantab.net> | 2020-09-02 18:49:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-02 13:49:25 -0400 |
| commit | 714ab71ddc4260937b1480519d453d2dc4e77dd6 (patch) | |
| tree | d9fafe938f423afd2cce7d6a2bcab14276e8b61a /modules/migrations/migrate.go | |
| parent | 84eac6ed6c1b02a28c83cd2695aa470c4acf46e9 (diff) | |
| download | gitea-714ab71ddc4260937b1480519d453d2dc4e77dd6.tar.gz gitea-714ab71ddc4260937b1480519d453d2dc4e77dd6.zip | |
Ensure that all migration requests are cancellable (#12669)
* Ensure that all migration requests are cancellable
Signed-off-by: Andrew Thornton <art27@cantab.net>
* Use WithContext as RequestWithContext is go 1.14
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Diffstat (limited to 'modules/migrations/migrate.go')
| -rw-r--r-- | modules/migrations/migrate.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/modules/migrations/migrate.go b/modules/migrations/migrate.go index 7858dfc685..8543a3fc09 100644 --- a/modules/migrations/migrate.go +++ b/modules/migrations/migrate.go @@ -37,7 +37,7 @@ func MigrateRepository(ctx context.Context, doer *models.User, ownerName string, for _, factory := range factories { if factory.GitServiceType() == opts.GitServiceType { - downloader, err = factory.New(opts) + downloader, err = factory.New(ctx, opts) if err != nil { return nil, err } @@ -60,11 +60,9 @@ func MigrateRepository(ctx context.Context, doer *models.User, ownerName string, uploader.gitServiceType = opts.GitServiceType if setting.Migrations.MaxAttempts > 1 { - downloader = base.NewRetryDownloader(downloader, setting.Migrations.MaxAttempts, setting.Migrations.RetryBackoff) + downloader = base.NewRetryDownloader(ctx, downloader, setting.Migrations.MaxAttempts, setting.Migrations.RetryBackoff) } - downloader.SetContext(ctx) - if err := migrateRepository(downloader, uploader, opts); err != nil { if err1 := uploader.Rollback(); err1 != nil { log.Error("rollback failed: %v", err1) |