From d1a38a9a8ea46d1f00dfeb01645163010af17fe7 Mon Sep 17 00:00:00 2001 From: caicandong <1290147055@qq.com> Date: Sat, 30 Sep 2023 17:55:59 +0800 Subject: [PATCH 1/2] Use db.DefaultContext --- services/task/migrate.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/task/migrate.go b/services/task/migrate.go index 70e5abdee6ebd..4d4e0c07466ab 100644 --- a/services/task/migrate.go +++ b/services/task/migrate.go @@ -49,9 +49,9 @@ func runMigrateTask(ctx context.Context, t *admin_model.Task) (err error) { } if err == nil { - err = admin_model.FinishMigrateTask(ctx, t) + err = admin_model.FinishMigrateTask(db.DefaultContext, t) if err == nil { - notify_service.MigrateRepository(ctx, t.Doer, t.Owner, t.Repo) + notify_service.MigrateRepository(db.DefaultContext, t.Doer, t.Owner, t.Repo) return } @@ -64,7 +64,7 @@ func runMigrateTask(ctx context.Context, t *admin_model.Task) (err error) { t.Status = structs.TaskStatusFailed t.Message = err.Error() - if err := t.UpdateCols(ctx, "status", "message", "end_time"); err != nil { + if err := t.UpdateCols(db.DefaultContext, "status", "message", "end_time"); err != nil { log.Error("Task UpdateCols failed: %v", err) } From e8cd048ef08d2aebc3572595a8eca879876980df Mon Sep 17 00:00:00 2001 From: caicandong <1290147055@qq.com> Date: Sat, 30 Sep 2023 22:27:01 +0800 Subject: [PATCH 2/2] Add comment --- services/task/migrate.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/task/migrate.go b/services/task/migrate.go index 4d4e0c07466ab..b74e024ba6c3c 100644 --- a/services/task/migrate.go +++ b/services/task/migrate.go @@ -47,7 +47,7 @@ func runMigrateTask(ctx context.Context, t *admin_model.Task) (err error) { err = fmt.Errorf("PANIC whilst trying to do migrate task: %v", e) 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)) } - + // fixme: Because ctx is canceled here, so the db.DefaultContext is needed. if err == nil { err = admin_model.FinishMigrateTask(db.DefaultContext, t) if err == nil { @@ -63,7 +63,7 @@ func runMigrateTask(ctx context.Context, t *admin_model.Task) (err error) { t.EndTime = timeutil.TimeStampNow() t.Status = structs.TaskStatusFailed t.Message = err.Error() - + // fixme: Because ctx is canceled here, so the db.DefaultContext is needed. if err := t.UpdateCols(db.DefaultContext, "status", "message", "end_time"); err != nil { log.Error("Task UpdateCols failed: %v", err) }