补齐任务部分成功与重试状态
支持批量部署部分成功任务状态,补齐重试等待、取消和服务重启恢复的任务状态范围,并增加 HTTP 回归测试。
This commit is contained in:
1 parent
8c80a7261f
commit
c9a82e6953
6 files changed
+44
-10
No files matched your search
@@ -148,6 +148,7 @@ func (s *Server) executeCertificateIssueTask(c *gin.Context, task repository.Tas
|
||||
status := "success"
|
||||
message := "证书申请和部署完成"
|
||||
cancelled := false
|
||||
partial := issueErr == nil && deploymentReport.Status == "partial"
|
||||
if issueErr != nil {
|
||||
status = "failed"
|
||||
message = certificateTaskErrorMessage(issueErr)
|
||||
@@ -157,6 +158,8 @@ func (s *Server) executeCertificateIssueTask(c *gin.Context, task repository.Tas
|
||||
if errors.Is(issueErr, context.Canceled) {
|
||||
status = "cancelled"
|
||||
}
|
||||
} else if partial {
|
||||
status = "partial_success"
|
||||
}
|
||||
if persisted, err := s.tasks.GetTask(context.Background(), task.ID); err == nil && persisted.Status == "cancelled" {
|
||||
status = "cancelled"
|
||||
|
||||
@@ -532,3 +532,34 @@ func TestTaskAPIRetriesFailedCertificateIssue(t *testing.T) {
|
||||
t.Fatalf("retry audit was not recorded correctly: %+v %v", logs, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestTaskAPIRecordsPartialDeploymentSuccess(t *testing.T) {
|
||||
server, taskRepo, auditRepo, closeDB := newTaskAPITestServer(t, func(_ context.Context, id string) (certificate.IssueResult, deployment.Report, error) {
|
||||
return certificate.IssueResult{DomainID: id}, deployment.Report{
|
||||
Total: 2, Success: 1, Failed: 1, Status: "partial",
|
||||
Results: []deployment.Result{
|
||||
{ServerID: "server-success", Status: "success"},
|
||||
{ServerID: "server-failed", Status: "failed", Message: "deployment failed"},
|
||||
},
|
||||
}, nil
|
||||
})
|
||||
defer closeDB()
|
||||
|
||||
response := httptest.NewRecorder()
|
||||
serveAdminHTTP(server, response, httptest.NewRequest(http.MethodPost, "/api/v1/domains/domain-1/issue", nil))
|
||||
if response.Code != http.StatusOK {
|
||||
t.Fatalf("partial response: %d %s", response.Code, response.Body.String())
|
||||
}
|
||||
items, err := taskRepo.ListTasks(context.Background(), "domain-1", 10)
|
||||
if err != nil || len(items) != 1 || items[0].Status != "partial_success" {
|
||||
t.Fatalf("partial task status: %+v %v", items, err)
|
||||
}
|
||||
attempts, err := taskRepo.ListAttempts(context.Background(), items[0].ID)
|
||||
if err != nil || len(attempts) != 1 || attempts[0].Status != "partial_success" {
|
||||
t.Fatalf("partial attempt status: %+v %v", attempts, err)
|
||||
}
|
||||
logs, err := auditRepo.ListAuditLogs(context.Background(), 10)
|
||||
if err != nil || len(logs) != 1 || logs[0].Status != "partial_success" {
|
||||
t.Fatalf("partial audit status: %+v %v", logs, err)
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user