Skip to content

Commit 87aa552

Browse files
authored
Fix unexpected context canceled when migrating repository (#27368)
Fix #27363 Regression of #27089
1 parent 7ad3156 commit 87aa552

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

services/task/migrate.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ func runMigrateTask(ctx context.Context, t *admin_model.Task) (err error) {
4747
err = fmt.Errorf("PANIC whilst trying to do migrate task: %v", e)
4848
log.Critical("PANIC during runMigrateTask[%d] by DoerID[%d] to RepoID[%d] for OwnerID[%d]: %v\nStacktrace: %v", t.ID, t.DoerID, t.RepoID, t.OwnerID, e, log.Stack(2))
4949
}
50-
50+
// fixme: Because ctx is canceled here, so the db.DefaultContext is needed.
5151
if err == nil {
52-
err = admin_model.FinishMigrateTask(ctx, t)
52+
err = admin_model.FinishMigrateTask(db.DefaultContext, t)
5353
if err == nil {
54-
notify_service.MigrateRepository(ctx, t.Doer, t.Owner, t.Repo)
54+
notify_service.MigrateRepository(db.DefaultContext, t.Doer, t.Owner, t.Repo)
5555
return
5656
}
5757

@@ -63,8 +63,8 @@ func runMigrateTask(ctx context.Context, t *admin_model.Task) (err error) {
6363
t.EndTime = timeutil.TimeStampNow()
6464
t.Status = structs.TaskStatusFailed
6565
t.Message = err.Error()
66-
67-
if err := t.UpdateCols(ctx, "status", "message", "end_time"); err != nil {
66+
// fixme: Because ctx is canceled here, so the db.DefaultContext is needed.
67+
if err := t.UpdateCols(db.DefaultContext, "status", "message", "end_time"); err != nil {
6868
log.Error("Task UpdateCols failed: %v", err)
6969
}
7070

0 commit comments

Comments
 (0)