完善部署事务持久化与中断恢复

接入任务上下文、部署事务日志、启动恢复流程及恢复回归测试,保留无法证明归属时的人工核查状态。
This commit is contained in:
xuans committed 2026-10-01 02:36:58 +08:00
1 parent 3a0e1d8769
commit 918e3f6d25
6 files changed
+380 -8

No files matched your search

+6 -1
View File
@@ -103,6 +103,11 @@ func NewWithConfigPath(ctx context.Context, cfg config.Config, configPath string
}
}
taskRepo := repository.NewSQLTaskRepository(db.DB, runtimeDatabaseConfig.Driver)
transactionRepo := repository.NewSQLDeploymentTransactionRepository(db.DB, runtimeDatabaseConfig.Driver)
deploymentService := deployment.NewServiceWithJournal(deployment.SSHFactory{Secrets: secretStore}, transactionRepo)
if err := deploymentService.RecoverPending(ctx, serverRepo.GetServerByID); err != nil {
logger.Error("恢复中断部署事务失败,已保留现场等待人工核查", "error", err)
}
if recovered, err := taskRepo.RecoverInterruptedTasks(ctx, time.Now().UTC()); err != nil {
_ = db.Close()
_ = logger.Close()
@@ -121,7 +126,7 @@ func NewWithConfigPath(ctx context.Context, cfg config.Config, configPath string
certificates := certificate.NewService(cfg, repo, secretStore, dnsprovider.NewLegoFactory(), accounts)
aliyunAuthChecker := dnsprovider.NewAliyunAuthorizationChecker()
certificates.SetDNSAuthorizationChecker(aliyunAuthChecker)
deploymentService := deployment.NewService(deployment.SSHFactory{Secrets: secretStore})
notifier := notification.New(cfg.Notification, secretStore)
remoteValidator := certificate.RemoteValidator{}
workflow := &CertificateWorkflow{
@@ -147,6 +147,9 @@ func (w *certificateTaskWorkflow) run(ctx context.Context, id, taskType, stage s
return result, err
}
issueCtx, cancel := context.WithTimeout(taskCtx, 30*time.Minute)
issueCtx = deployment.WithTransactionContext(issueCtx, deployment.TransactionContext{
TaskID: task.ID, AttemptID: attempt.ID, AttemptNumber: attempt.AttemptNumber,
})
result, resultErr = execute(issueCtx, id)
cancel()
if recordErr := w.tasks.RecordTaskDeploymentResults(taskCtx, task.ID, attempt.ID, number, taskDeploymentResults(result.Deployment)); recordErr != nil {