Correctly handle failed migrations (#17575)

* Correctly handle failed migrations

There is a bug in handling failed migrations whereby the migration task gets decoupled
from the migration repository. This leads to a failure of the task to get deleted with
the repository and also leads to the migration failed page resulting in a ISE.

This PR removes the zeroing out of the task id from the migration but also makes
the migration handler tolerate missing tasks much nicer.

Fix #17571

Signed-off-by: Andrew Thornton <art27@cantab.net>

diff --git a/modules/task/migrate.go b/modules/task/migrate.go
index 52f4bb91cf722ef40dfe981cf82fb63fab74cef4..715e76b4ade087fb292a239930944e34867ec5b4 100644 (file)
--- a/modules/task/migrate.go
+++ b/modules/task/migrate.go
@@ -58,6 +58,9 @@ func runMigrateTask(t *models.Task) (err error) {
                t.EndTime = timeutil.TimeStampNow()
                t.Status = structs.TaskStatusFailed
                t.Message = err.Error()
+               // Ensure that the repo loaded before we zero out the repo ID from the task - thus ensuring that we can delete it
+               _ = t.LoadRepo()
+
                t.RepoID = 0
                if err := t.UpdateCols("status", "errors", "repo_id", "end_time"); err != nil {
                        log.Error("Task UpdateCols failed: %v", err)

diff --git a/modules/task/task.go b/modules/task/task.go
index 4e782869f93f586b4ac0048afa35491379bdccd6..51377df78c93169098e02559774e01edf34c0708 100644 (file)
--- a/modules/task/task.go
+++ b/modules/task/task.go
@@ -90,7 +90,7 @@ func CreateMigrateTask(doer, u *models.User, opts base.MigrateOptions) (*models.
                return nil, err
        }
 
-       var task = models.Task{
+       var task = &models.Task{
                DoerID:         doer.ID,
                OwnerID:        u.ID,
                Type:           structs.TaskTypeMigrateRepo,
@@ -98,7 +98,7 @@ func CreateMigrateTask(doer, u *models.User, opts base.MigrateOptions) (*models.
                PayloadContent: string(bs),
        }
 
-       if err := models.CreateTask(&task); err != nil {
+       if err := models.CreateTask(task); err != nil {
                return nil, err
        }
 
@@ -126,5 +126,5 @@ func CreateMigrateTask(doer, u *models.User, opts base.MigrateOptions) (*models.
                return nil, err
        }
 
-       return &task, nil
+       return task, nil
 }

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 2632531e2fb5441b191bc447b302e11178919185..6fad20c87ed0085f67615cea182609feb0527f19 100644 (file)
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -904,6 +904,7 @@ migrate.migrate = Migrate From %s
 migrate.migrating = Migrating from <b>%s</b> ...
 migrate.migrating_failed = Migrating from <b>%s</b> failed.
 migrate.migrating_failed.error = Error: %s
+migrate.migrating_failed_no_addr = Migration failed.
 migrate.github.description = Migrate data from github.com or other Github instances.
 migrate.git.description = Migrate a repository only from any Git service.
 migrate.gitlab.description = Migrate data from gitlab.com or other GitLab instances.

diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go
index 72f12e9bf2a556d646737397620b988c9c9f50d8..cecd8437b6962f0193e47597b4ff9fe45baa00d5 100644 (file)
--- a/routers/web/repo/view.go
+++ b/routers/web/repo/view.go
@@ -583,6 +583,13 @@ func checkHomeCodeViewable(ctx *context.Context) {
                if ctx.Repo.Repository.IsBeingCreated() {
                        task, err := models.GetMigratingTask(ctx.Repo.Repository.ID)
                        if err != nil {
+                               if models.IsErrTaskDoesNotExist(err) {
+                                       ctx.Data["Repo"] = ctx.Repo
+                                       ctx.Data["CloneAddr"] = ""
+                                       ctx.Data["Failed"] = true
+                                       ctx.HTML(http.StatusOK, tplMigrating)
+                                       return
+                               }
                                ctx.ServerError("models.GetMigratingTask", err)
                                return
                        }

diff --git a/routers/web/user/task.go b/routers/web/user/task.go
index c71d435233933f70748660d9cab87a8c452215c9..4dbd1b8537bf47f348df054d20c5c7051b6cdac4 100644 (file)
--- a/routers/web/user/task.go
+++ b/routers/web/user/task.go
@@ -6,6 +6,7 @@ package user
 
 import (
        "net/http"
+       "strconv"
 
        "code.gitea.io/gitea/models"
        "code.gitea.io/gitea/modules/context"
@@ -16,6 +17,12 @@ import (
 func TaskStatus(ctx *context.Context) {
        task, opts, err := models.GetMigratingTaskByID(ctx.ParamsInt64("task"), ctx.User.ID)
        if err != nil {
+               if models.IsErrTaskDoesNotExist(err) {
+                       ctx.JSON(http.StatusNotFound, map[string]interface{}{
+                               "error": "task `" + strconv.FormatInt(ctx.ParamsInt64("task"), 10) + "` does not exist",
+                       })
+                       return
+               }
                ctx.JSON(http.StatusInternalServerError, map[string]interface{}{
                        "err": err,
                })

diff --git a/templates/repo/migrate/migrating.tmpl b/templates/repo/migrate/migrating.tmpl
index cc12243205c15cc619e2c1a3d89796fcdd6bd69a..6df7f0a65d687703cb210a4779b0976abce3c018 100644 (file)
--- a/templates/repo/migrate/migrating.tmpl
+++ b/templates/repo/migrate/migrating.tmpl
@@ -25,7 +25,11 @@
                                                                <p id="repo_migrating_progress_message"></p>
                                                        </div>
                                                        <div id="repo_migrating_failed" hidden>
-                                                               <p>{{.i18n.Tr "repo.migrate.migrating_failed" .CloneAddr | Safe}}</p>
+                                                               {{if .CloneAddr}}
+                                                                       <p>{{.i18n.Tr "repo.migrate.migrating_failed" .CloneAddr | Safe}}</p>
+                                                               {{else}}
+                                                                       <p>{{.i18n.Tr "repo.migrate.migrating_failed_no_addr" | Safe}}</p>
+                                                               {{end}}
                                                                <p id="repo_migrating_failed_error"></p>
                                                        </div>
                                                        {{if and .Failed .Permission.IsAdmin}}