Skip to content

Commit 2bd7fee

Browse files
authored
Log the underlying panic in runMigrateTask (#13096) (#13098)
Backport #13096 If there is a panic during runMigrateTask we should capture and log the underlying panic error. This PR ensures that the panic is logged and captured as part of the task message. Fix #13095 Signed-off-by: Andrew Thornton <[email protected]>
1 parent a0a77c9 commit 2bd7fee

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

modules/task/migrate.go

+4-7
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
package task
66

77
import (
8-
"bytes"
98
"errors"
109
"fmt"
1110
"strings"
@@ -38,10 +37,8 @@ func handleCreateError(owner *models.User, err error, name string) error {
3837
func runMigrateTask(t *models.Task) (err error) {
3938
defer func() {
4039
if e := recover(); e != nil {
41-
var buf bytes.Buffer
42-
fmt.Fprintf(&buf, "Handler crashed with error: %v", log.Stack(2))
43-
44-
err = errors.New(buf.String())
40+
err = fmt.Errorf("PANIC whilst trying to do migrate task: %v\nStacktrace: %v", err, log.Stack(2))
41+
log.Critical("PANIC during runMigrateTask[%d] by DoerID[%d] to RepoID[%d] for OwnerID[%d]: %v", t.ID, t.DoerID, t.RepoID, t.OwnerID, err)
4542
}
4643

4744
if err == nil {
@@ -51,14 +48,14 @@ func runMigrateTask(t *models.Task) (err error) {
5148
return
5249
}
5350

54-
log.Error("FinishMigrateTask failed: %s", err.Error())
51+
log.Error("FinishMigrateTask[%d] by DoerID[%d] to RepoID[%d] for OwnerID[%d] failed: %v", t.ID, t.DoerID, t.RepoID, t.OwnerID, err)
5552
}
5653

5754
t.EndTime = timeutil.TimeStampNow()
5855
t.Status = structs.TaskStatusFailed
5956
t.Errors = err.Error()
6057
if err := t.UpdateCols("status", "errors", "end_time"); err != nil {
61-
log.Error("Task UpdateCols failed: %s", err.Error())
58+
log.Error("Task UpdateCols failed: %v", err)
6259
}
6360

6461
if t.Repo != nil {

0 commit comments

Comments
 (0)