mirror of
https://gitcode.com/JianFeeeee/HomeAgent.git
synced 2026-09-24 19:08:10 +00:00
三层回退恢复机制(L0写前留档/L1恢复梯子/L2离线回滚)+ guard 父守护
- L0: files 插件写受保护系统路径(/etc 等)前自动留档,AbstractBeforeWrite 到 data/file_baseline - L1: failback 受限 worker 执行恢复梯子 probe→还原DNS/proxy→还原LLM配置+ReloadFromConfig→probe,N轮有界 - L2: tracker changeset 持久化原文 blob,guard 离线 RollbackFromDisk 回滚 agentfs;SystemSnapshot 支撑 - guard 父守护: 心跳 IPC(PING/ACK unix socket, 文件心跳回退)、失败计数、退出码协议(42/43/44)、最后手段 - 发行版路径适配: system.protected_paths/network_paths 可注入,默认面向主流 Linux - Windows 兼容: guard.go/failback.go 加 //go:build linux, guard_windows.go 提供 no-op 桩 - 修复: guard.yaml last_resort 键冲突、changeset Content 不落盘导致离线回滚丢原文 Build 全绿, vet 干净, system/recovery/ipc/tracker 单元测试全过
This commit is contained in:
114
internal/tracker/disk.go
Normal file
114
internal/tracker/disk.go
Normal file
@ -0,0 +1,114 @@
|
||||
package tracker
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"log"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"sort"
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
|
||||
// LoadChangeSetsFromDisk 把 <dataDir>/changesets/*.json 读回内存 changeSets
|
||||
// (按修改时间正序),使 guard 可在 worker 未运行时离线回滚 agentfs。
|
||||
func (t *Tracker) LoadChangeSetsFromDisk() (int, error) {
|
||||
dir := filepath.Join(t.dataDir, "changesets")
|
||||
entries, err := os.ReadDir(dir)
|
||||
if err != nil {
|
||||
if os.IsNotExist(err) {
|
||||
return 0, nil
|
||||
}
|
||||
return 0, err
|
||||
}
|
||||
|
||||
type csFile struct {
|
||||
path string
|
||||
mod time.Time
|
||||
}
|
||||
var files []csFile
|
||||
for _, e := range entries {
|
||||
if e.IsDir() || !strings.HasSuffix(e.Name(), ".json") {
|
||||
continue
|
||||
}
|
||||
info, err := e.Info()
|
||||
if err != nil {
|
||||
continue
|
||||
}
|
||||
files = append(files, csFile{path: filepath.Join(dir, e.Name()), mod: info.ModTime()})
|
||||
}
|
||||
sort.Slice(files, func(i, j int) bool { return files[i].mod.Before(files[j].mod) })
|
||||
|
||||
t.mu.Lock()
|
||||
defer t.mu.Unlock()
|
||||
t.changeSets = t.changeSets[:0]
|
||||
for _, f := range files {
|
||||
data, err := os.ReadFile(f.path)
|
||||
if err != nil {
|
||||
continue
|
||||
}
|
||||
var cs ChangeSet
|
||||
if err := json.Unmarshal(data, &cs); err != nil {
|
||||
continue
|
||||
}
|
||||
t.loadContentBlobs(&cs, dir)
|
||||
t.changeSets = append(t.changeSets, &cs)
|
||||
}
|
||||
log.Printf("[tracker] loaded %d changesets from disk", len(t.changeSets))
|
||||
return len(t.changeSets), nil
|
||||
}
|
||||
|
||||
// RollbackFromDisk 供 guard 在 worker 离线时执行 L2 agentfs 回滚:
|
||||
// 读回全部持久化 changeset 并按时间逆序逆应用(还原被改/被删文件、删除新增),
|
||||
// 然后删除这些 changeset 文件。返回还原的 changeset 数。
|
||||
func (t *Tracker) RollbackFromDisk() (int, error) {
|
||||
if _, err := t.LoadChangeSetsFromDisk(); err != nil {
|
||||
return 0, err
|
||||
}
|
||||
|
||||
t.mu.Lock()
|
||||
defer t.mu.Unlock()
|
||||
n := len(t.changeSets)
|
||||
if n == 0 {
|
||||
log.Printf("[tracker] rollback from disk: nothing to revert")
|
||||
return 0, nil
|
||||
}
|
||||
for i := n - 1; i >= 0; i-- {
|
||||
t.applyReverseLocked(t.changeSets[i])
|
||||
}
|
||||
dir := filepath.Join(t.dataDir, "changesets")
|
||||
for _, cs := range t.changeSets {
|
||||
os.Remove(filepath.Join(dir, cs.ID+".json"))
|
||||
removeContentBlobs(dir, cs.ID)
|
||||
}
|
||||
t.changeSets = t.changeSets[:0]
|
||||
log.Printf("[tracker] rollback from disk: reverted %d change sets", n)
|
||||
return n, nil
|
||||
}
|
||||
|
||||
// ChangesetsOnDisk 返回磁盘上持久化 changeset 数量(guard 决策用)。
|
||||
func (t *Tracker) ChangesetsOnDisk() int {
|
||||
dir := filepath.Join(t.dataDir, "changesets")
|
||||
entries, err := os.ReadDir(dir)
|
||||
if err != nil {
|
||||
return 0
|
||||
}
|
||||
n := 0
|
||||
for _, e := range entries {
|
||||
if !e.IsDir() && strings.HasSuffix(e.Name(), ".json") {
|
||||
n++
|
||||
}
|
||||
}
|
||||
return n
|
||||
}
|
||||
|
||||
// NewOfflineTracker 构造一个仅用于离线回滚的 tracker(不 mount overlay)。
|
||||
// worker 目录不存在时也会自动创建(Init 语义)。
|
||||
func NewOfflineTracker(dataDir, workDir string) *Tracker {
|
||||
t := NewTracker(dataDir, workDir)
|
||||
_ = t.Init()
|
||||
return t
|
||||
}
|
||||
|
||||
var _ = fmt.Sprintf
|
||||
Reference in New Issue
Block a user