wonder/xinfra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(delivery): expose rollback retry, release ack and CloudDM retry APIs

Browse Source 
- POST /delivery/tasks/:id/rollback/retry  (platform admin) re-launches
  the rollback job after a previous cleanup failure
- POST /delivery/tasks/:id/rollback/release (platform admin) releases
  bookkeeping after the operator verified the target host manually
- POST /delivery/tasks/:id/clouddm/retry retries only the CloudDM
  registration step for an already healthy instance
- task logs now include rollback AWX job stdout and localized
  text/classes for the new rollback states
This commit is contained in:
Hungerdream
2026-07-28 14:29:26 +08:00
parent f0c1b38c5b
commit be39f2a03c
3 changed files with 78 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/internal/handler/task_log.go
+26 -3
View File
@@ -138,7 +138,7 @@ func (h *TaskLogHandler) getAWXTask(c *gin.Context, taskID string, userID uint64
lines = append(lines, taskLogLine{Time: formatTaskLogTime(event.CreatedAt), Message: "[" + event.ToState + "] " + event.Message, Class: classForTaskStatus(event.ToState)})
}
var execution model.ExecutionJob
if err := h.db.WithContext(c.Request.Context()).Where("task_id = ?", task.ID).First(&execution).Error; err == nil && execution.ExecutorJobID != "" && execution.ExecutorJobID != "pending" {
if err := h.db.WithContext(c.Request.Context()).Where("task_id = ?", task.ID).First(&execution).Error; err == nil && execution.ExecutorJobID != "" && execution.ExecutorJobID != "pending" && !strings.HasPrefix(execution.ExecutorJobID, "pending-") {
stdout, stdoutErr := h.delivery.AWXJobStdout(c.Request.Context(), execution.ExecutorJobID)
if stdoutErr != nil {
lines = append(lines, taskLogLine{Time: formatTaskLogTime(time.Now()), Message: "[awx] stdout fetch failed: " + stdoutErr.Error(), Class: "err"})
@@ -146,6 +146,15 @@ func (h *TaskLogHandler) getAWXTask(c *gin.Context, taskID string, userID uint64
lines = append(lines, splitStdoutLines(stdout)...)
}
}
var rollback model.RollbackJob
if err := h.db.WithContext(c.Request.Context()).Where("task_id = ?", task.ID).First(&rollback).Error; err == nil && rollback.ExecutorJobID != "" && rollback.ExecutorJobID != "pending" && !strings.HasPrefix(rollback.ExecutorJobID, "pending-") {
stdout, stdoutErr := h.delivery.AWXJobStdout(c.Request.Context(), rollback.ExecutorJobID)
if stdoutErr != nil {
lines = append(lines, taskLogLine{Time: formatTaskLogTime(time.Now()), Message: "[rollback awx] stdout fetch failed: " + stdoutErr.Error(), Class: "err"})
} else {
lines = append(lines, splitStdoutLines(stdout)...)
}
}
c.JSON(http.StatusOK, gin.H{"task": awxTaskSummary(*task), "lines": lines})
}
@@ -257,8 +266,18 @@ func textForTaskStatus(status string) string {
return "等待"
case model.TaskRunning, model.TaskRegistering, model.TaskCanceling:
return "执行中"
case model.TaskRollbackPending, model.TaskRollingBack:
return "回退中"
case model.TaskFinished:
return "成功"
case model.TaskRolledBack:
return "已回退"
case model.TaskRollbackFailed:
return "回退失败"
case model.TaskRollbackAck:
return "已确认释放"
case model.TaskRegisterFailed:
return "注册失败（实例保留）"
case model.TaskCanceled:
return "已取消"
default:
@@ -270,10 +289,14 @@ func classForTaskStatus(status string) string {
switch status {
case model.TaskFinished:
return "ok"
case model.TaskExecutionFailed, model.TaskValidationFailed, model.TaskRegisterFailed, model.TaskCanceled:
case model.TaskExecutionFailed, model.TaskValidationFailed, model.TaskCanceled, model.TaskRollbackFailed:
return "err"
case model.TaskRunning, model.TaskDispatching, model.TaskRegistering, model.TaskCanceling:
case model.TaskRollbackAck, model.TaskRegisterFailed:
return "warn"
case model.TaskRunning, model.TaskDispatching, model.TaskRegistering, model.TaskCanceling, model.TaskRollbackPending, model.TaskRollingBack:
return "warn"
case model.TaskRolledBack:
return "ok"
default:
return ""
}