lianguan/gitea
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Next round of db.DefaultContext refactor (#27089)

Browse Source 
Part of #27065
This commit is contained in:
JakobDev
2023-09-16 16:39:12 +02:00
committed by GitHub
parent a1b2a11812
commit f91dbbba98
90 changed files with 434 additions and 464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
services/task/migrate.go
View File

@ -4,6 +4,7 @@
package task
import (
"context"
"errors"
"fmt"
"strings"
@ -40,7 +41,7 @@ func handleCreateError(owner *user_model.User, err error) error {
}
}
func runMigrateTask(t *admin_model.Task) (err error) {
func runMigrateTask(ctx context.Context, t *admin_model.Task) (err error) {
defer func() {
if e := recover(); e != nil {
err = fmt.Errorf("PANIC whilst trying to do migrate task: %v", e)
@ -48,9 +49,9 @@ func runMigrateTask(t *admin_model.Task) (err error) {
}
if err == nil {
err = admin_model.FinishMigrateTask(t)
err = admin_model.FinishMigrateTask(ctx, t)
if err == nil {
notify_service.MigrateRepository(db.DefaultContext, t.Doer, t.Owner, t.Repo)
notify_service.MigrateRepository(ctx, t.Doer, t.Owner, t.Repo)
return
}
@ -63,14 +64,14 @@ func runMigrateTask(t *admin_model.Task) (err error) {
t.Status = structs.TaskStatusFailed
t.Message = err.Error()
if err := t.UpdateCols("status", "message", "end_time"); err != nil {
if err := t.UpdateCols(ctx, "status", "message", "end_time"); err != nil {
log.Error("Task UpdateCols failed: %v", err)
}
// then, do not delete the repository, otherwise the users won't be able to see the last error
}()
if err = t.LoadRepo(); err != nil {
if err = t.LoadRepo(ctx); err != nil {
return err
}
@ -79,10 +80,10 @@ func runMigrateTask(t *admin_model.Task) (err error) {
return nil
}
if err = t.LoadDoer(); err != nil {
if err = t.LoadDoer(ctx); err != nil {
return err
}
if err = t.LoadOwner(); err != nil {
if err = t.LoadOwner(ctx); err != nil {
return err
}
@ -100,7 +101,7 @@ func runMigrateTask(t *admin_model.Task) (err error) {
t.StartTime = timeutil.TimeStampNow()
t.Status = structs.TaskStatusRunning
if err = t.UpdateCols("start_time", "status"); err != nil {
if err = t.UpdateCols(ctx, "start_time", "status"); err != nil {
return err
}
@ -112,7 +113,7 @@ func runMigrateTask(t *admin_model.Task) (err error) {
case <-ctx.Done():
return
}
task, _ := admin_model.GetMigratingTask(t.RepoID)
task, _ := admin_model.GetMigratingTask(ctx, t.RepoID)
if task != nil && task.Status != structs.TaskStatusRunning {
log.Debug("MigrateTask[%d] by DoerID[%d] to RepoID[%d] for OwnerID[%d] is canceled due to status is not 'running'", t.ID, t.DoerID, t.RepoID, t.OwnerID)
cancel()
@ -128,7 +129,7 @@ func runMigrateTask(t *admin_model.Task) (err error) {
}
bs, _ := json.Marshal(message)
t.Message = string(bs)
_ = t.UpdateCols("message")
_ = t.UpdateCols(ctx, "message")
})
if err == nil {

27
services/task/task.go
View File

@ -4,6 +4,7 @@
package task
import (
"context"
"fmt"
admin_model "code.gitea.io/gitea/models/admin"
@ -27,10 +28,10 @@ import (
var taskQueue *queue.WorkerPoolQueue[*admin_model.Task]
// Run a task
func Run(t *admin_model.Task) error {
func Run(ctx context.Context, t *admin_model.Task) error {
switch t.Type {
case structs.TaskTypeMigrateRepo:
return runMigrateTask(t)
return runMigrateTask(ctx, t)
default:
return fmt.Errorf("Unknown task type: %d", t.Type)
}
@ -48,7 +49,7 @@ func Init() error {
func handler(items ...*admin_model.Task) []*admin_model.Task {
for _, task := range items {
if err := Run(task); err != nil {
if err := Run(db.DefaultContext, task); err != nil {
log.Error("Run task failed: %v", err)
}
}
@ -56,8 +57,8 @@ func handler(items ...*admin_model.Task) []*admin_model.Task {
}
// MigrateRepository add migration repository to task
func MigrateRepository(doer, u *user_model.User, opts base.MigrateOptions) error {
task, err := CreateMigrateTask(doer, u, opts)
func MigrateRepository(ctx context.Context, doer, u *user_model.User, opts base.MigrateOptions) error {
task, err := CreateMigrateTask(ctx, doer, u, opts)
if err != nil {
return err
}
@ -66,7 +67,7 @@ func MigrateRepository(doer, u *user_model.User, opts base.MigrateOptions) error
}
// CreateMigrateTask creates a migrate task
func CreateMigrateTask(doer, u *user_model.User, opts base.MigrateOptions) (*admin_model.Task, error) {
func CreateMigrateTask(ctx context.Context, doer, u *user_model.User, opts base.MigrateOptions) (*admin_model.Task, error) {
// encrypt credentials for persistence
var err error
opts.CloneAddrEncrypted, err = secret.EncryptSecret(setting.SecretKey, opts.CloneAddr)
@ -97,11 +98,11 @@ func CreateMigrateTask(doer, u *user_model.User, opts base.MigrateOptions) (*adm
PayloadContent: string(bs),
}
if err := admin_model.CreateTask(task); err != nil {
if err := admin_model.CreateTask(ctx, task); err != nil {
return nil, err
}
repo, err := repo_service.CreateRepositoryDirectly(db.DefaultContext, doer, u, repo_service.CreateRepoOptions{
repo, err := repo_service.CreateRepositoryDirectly(ctx, doer, u, repo_service.CreateRepoOptions{
Name: opts.RepoName,
Description: opts.Description,
OriginalURL: opts.OriginalURL,
@ -113,7 +114,7 @@ func CreateMigrateTask(doer, u *user_model.User, opts base.MigrateOptions) (*adm
if err != nil {
task.EndTime = timeutil.TimeStampNow()
task.Status = structs.TaskStatusFailed
err2 := task.UpdateCols("end_time", "status")
err2 := task.UpdateCols(ctx, "end_time", "status")
if err2 != nil {
log.Error("UpdateCols Failed: %v", err2.Error())
}
@ -121,7 +122,7 @@ func CreateMigrateTask(doer, u *user_model.User, opts base.MigrateOptions) (*adm
}
task.RepoID = repo.ID
if err = task.UpdateCols("repo_id"); err != nil {
if err = task.UpdateCols(ctx, "repo_id"); err != nil {
return nil, err
}
@ -129,8 +130,8 @@ func CreateMigrateTask(doer, u *user_model.User, opts base.MigrateOptions) (*adm
}
// RetryMigrateTask retry a migrate task
func RetryMigrateTask(repoID int64) error {
migratingTask, err := admin_model.GetMigratingTask(repoID)
func RetryMigrateTask(ctx context.Context, repoID int64) error {
migratingTask, err := admin_model.GetMigratingTask(ctx, repoID)
if err != nil {
log.Error("GetMigratingTask: %v", err)
return err
@ -144,7 +145,7 @@ func RetryMigrateTask(repoID int64) error {
// Reset task status and messages
migratingTask.Status = structs.TaskStatusQueued
migratingTask.Message = ""
if err = migratingTask.UpdateCols("status", "message"); err != nil {
if err = migratingTask.UpdateCols(ctx, "status", "message"); err != nil {
log.Error("task.UpdateCols failed: %v", err)
return err
}