From 714ab71ddc4260937b1480519d453d2dc4e77dd6 Mon Sep 17 00:00:00 2001 From: zeripath Date: Wed, 2 Sep 2020 18:49:25 +0100 Subject: Ensure that all migration requests are cancellable (#12669) * Ensure that all migration requests are cancellable Signed-off-by: Andrew Thornton * Use WithContext as RequestWithContext is go 1.14 Signed-off-by: Andrew Thornton Co-authored-by: techknowlogick --- modules/migrations/migrate.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'modules/migrations/migrate.go') 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) -- cgit v1.2.3