删掉会自己开入口、只看服务健康的 FinalizeAfterOperatorRecovery。 新的 RecoverWindow 绑定原作业/目标指纹/持久化预备份,在维护关闭下 执行恢复与逐类校验,通过才恢复服务与入口;失败继续维护。 预备份身份与内容风险在第一笔写入前一起落盘;后台任务必须静默后才停写者; 写入者发布端口即拒绝开窗口;维护占用改为按实例互斥(000072)。
This commit is contained in:
@@ -145,6 +145,9 @@ type Config struct {
|
||||
VersionHistoryRepo string
|
||||
// LibraryArchiveRoot 是整库封存产物的只读归档根;留空即未接线(页面降级)。
|
||||
LibraryArchiveRoot string
|
||||
// LibraryTargetInstance 是实例级维护的目标实例名;留空即"未接线",
|
||||
// 页面不能发起按预备份恢复,接口返回原因而不是假装能恢复。
|
||||
LibraryTargetInstance string
|
||||
// LibraryAgentSocket 是主机侧封存 agent 的 unix socket;留空即页面不能发起封存。
|
||||
LibraryAgentSocket string
|
||||
// LibraryCapacityBudgetBytes 是整库归档容量预算;0 = 未设置(容量门禁不放行)。
|
||||
@@ -461,7 +464,22 @@ func NewHandler(config Config) (http.Handler, error) {
|
||||
writeJSON(w, http.StatusInternalServerError, map[string]string{"error": "无法读取维护窗口"})
|
||||
return
|
||||
}
|
||||
writeJSON(w, http.StatusOK, map[string]any{"held": held != nil && held.ReleasedAt == nil, "maintenance": held})
|
||||
response := map[string]any{"held": held != nil && held.ReleasedAt == nil, "maintenance": held}
|
||||
// 实例级占用才是真正的互斥来源:跨 scope 也在这里体现。
|
||||
if instanceStore, ok := config.Store.(interface {
|
||||
InstanceMaintenanceOf(ctx context.Context, instance string) (*postgresstore.LibraryInstanceMaintenance, error)
|
||||
}); ok && config.LibraryTargetInstance != "" {
|
||||
if instanceHeld, err := instanceStore.InstanceMaintenanceOf(r.Context(), config.LibraryTargetInstance); err == nil {
|
||||
response["instance"] = config.LibraryTargetInstance
|
||||
response["instance_maintenance"] = instanceHeld
|
||||
response["held"] = instanceHeld != nil && instanceHeld.ReleasedAt == nil
|
||||
}
|
||||
}
|
||||
writeJSON(w, http.StatusOK, response)
|
||||
})
|
||||
// 按预备份恢复并逐类校验:维护窗口卡住时唯一的收尾入口(worker 执行)。
|
||||
mux.HandleFunc("POST /api/v1/library/maintenance/recover", func(w http.ResponseWriter, r *http.Request) {
|
||||
libraryMaintenanceRecoverHandler(w, r, config)
|
||||
})
|
||||
mux.HandleFunc("GET /api/v1/library/jobs", func(w http.ResponseWriter, r *http.Request) {
|
||||
libraryJobsHandler(w, r, config)
|
||||
|
||||
Reference in New Issue
Block a user