- libraryagent:0700 目录内 0600 unix socket + SO_PEERCRED 同 uid, 固定 binary/归档/日志/项目/写入者声明,请求只能选范围与作业号 - API:POST/GET /api/v1/library/captures(入队 library.capture + 读队列状态) - worker:library.capture handler 走 socket;启动先 recover;不挂 Docker socket、 不持有来源凭据 - web:整库版本页显示真实作业状态并可发起封存(未接线/无权限给出原因) - scripts/library-agent-install.sh:构建、安装 systemd user 服务并读回权限
This commit is contained in:
@@ -202,6 +202,7 @@ func run(ctx context.Context, getenv func(string) string) error {
|
||||
VersionHistory: versionHistoryStore,
|
||||
VersionHistoryRepo: versionHistoryRepo,
|
||||
LibraryArchiveRoot: config.LibraryArchiveRoot,
|
||||
LibraryAgentSocket: config.LibraryAgentSocket,
|
||||
BackupHost: backuphost.New(backuphost.Config{
|
||||
SSHConfig: config.BackupHostSSHConfig,
|
||||
Target: config.BackupHostTarget,
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
// Command libraryagent is the host-side execution boundary for whole-library
|
||||
// capture. It runs as the ordinary operator account, owns no network listener
|
||||
// other than one 0600 unix socket, and executes exactly one fixed command shape.
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"flag"
|
||||
"log"
|
||||
"os"
|
||||
"os/signal"
|
||||
"path/filepath"
|
||||
"syscall"
|
||||
"time"
|
||||
|
||||
"knowledge-governance/internal/libraryagent"
|
||||
)
|
||||
|
||||
func main() {
|
||||
home, _ := os.UserHomeDir()
|
||||
var config libraryagent.Config
|
||||
flag.StringVar(&config.Socket, "socket", filepath.Join(home, ".local/share/knowledge-governance/agent.sock"), "unix socket for capture requests")
|
||||
flag.StringVar(&config.Binary, "binary", "/home/zheromiku/knowledge-governance/libraryctl", "libraryctl binary this agent executes")
|
||||
flag.StringVar(&config.ArchiveRoot, "archive", filepath.Join(home, ".local/share/knowledge-governance/library"), "sealed artifact root")
|
||||
flag.StringVar(&config.JournalRoot, "journal", filepath.Join(home, ".local/share/knowledge-governance/freeze"), "freeze journal root")
|
||||
flag.StringVar(&config.SourceApp, "source-app", "WKNFull-app", "source container describing the stack")
|
||||
flag.StringVar(&config.SourcePG, "source-pg", "WKNFull-postgres", "source PostgreSQL container")
|
||||
flag.StringVar(&config.SourceES, "source-es", "WKNFull-elasticsearch", "source Elasticsearch container")
|
||||
flag.StringVar(&config.GovernancePG, "governance-pg", "knowledge-governance-p1-postgres-1", "governance PostgreSQL container")
|
||||
flag.StringVar(&config.Project, "project", "weknora071full", "Compose project owning the writers")
|
||||
flag.StringVar(&config.Writers, "writers", "app", "declared writer services")
|
||||
nonWriters := flag.String("non-writers", defaultNonWriters, "service=reason for every other project service")
|
||||
flag.DurationVar(&config.MaxDuration, "max-duration", 10*time.Minute, "upper bound for one operation")
|
||||
describe := flag.Bool("describe", false, "print the fixed configuration and exit")
|
||||
flag.Parse()
|
||||
config.NonWriters = *nonWriters
|
||||
|
||||
agent, err := libraryagent.New(config)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
if *describe {
|
||||
log.Printf("library agent config: %+v", agent.Describe())
|
||||
return
|
||||
}
|
||||
ctx, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
|
||||
defer stop()
|
||||
log.Printf("library agent listening on %s (project %s, writers %s)", config.Socket, config.Project, config.Writers)
|
||||
if err = agent.Serve(ctx); err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
// defaultNonWriters mirrors scripts/library-capture.sh: every sibling service of
|
||||
// the source project is declared, with the reason it cannot write knowledge.
|
||||
const defaultNonWriters = "frontend=UI only; no knowledge writes" +
|
||||
",mcp=read-only MCP server" +
|
||||
",dobotai-target=alpine placeholder; no knowledge writes" +
|
||||
",docreader=parse RPC service; app persists parse output and settlement requires zero pending ops" +
|
||||
",elasticsearch=search store; not an initiator" +
|
||||
",postgres=database store; not an initiator" +
|
||||
",redis=queue/cache store; not an initiator" +
|
||||
",neo4j=graph store; not an initiator" +
|
||||
",langfuse-web=LLM observability UI" +
|
||||
",langfuse-worker=LLM observability worker; own storage" +
|
||||
",langfuse-clickhouse=observability store" +
|
||||
",langfuse-minio=observability object store" +
|
||||
",langfuse-db-init=one-shot init; exited" +
|
||||
",searxng=read-only search proxy" +
|
||||
",searxng-init=one-shot init; exited"
|
||||
@@ -9,12 +9,14 @@ import (
|
||||
"os/signal"
|
||||
"path/filepath"
|
||||
"syscall"
|
||||
"time"
|
||||
|
||||
"github.com/jackc/pgx/v5/pgxpool"
|
||||
|
||||
"knowledge-governance/internal/appconfig"
|
||||
"knowledge-governance/internal/governance"
|
||||
"knowledge-governance/internal/jobs"
|
||||
"knowledge-governance/internal/libraryagent"
|
||||
postgresstore "knowledge-governance/internal/platform/postgres"
|
||||
"knowledge-governance/internal/platform/weknora"
|
||||
"knowledge-governance/internal/versionhistory"
|
||||
@@ -24,6 +26,9 @@ import (
|
||||
"knowledge-governance/internal/workflows/testweknora"
|
||||
)
|
||||
|
||||
// libraryCaptureJobType is shared with the API which enqueues it.
|
||||
const libraryCaptureJobType = "library.capture"
|
||||
|
||||
func main() {
|
||||
ctx, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
|
||||
defer stop()
|
||||
@@ -126,6 +131,40 @@ func workerHandlers(store *postgresstore.Store, config appconfig.Config) (map[st
|
||||
return nil, fmt.Errorf("create artifact fetch handler: %w", err)
|
||||
}
|
||||
handlers["artifact.fetch"] = artifactHandler.Handle
|
||||
if config.LibraryAgentSocket != "" {
|
||||
// 整库封存:worker 只投递请求并记录结果,真正的停机/导出/恢复发生在主机侧
|
||||
// agent(同 uid unix socket)。容器里既没有 Docker socket,也没有来源凭据。
|
||||
agentConfig := libraryagent.ClientConfig{Socket: config.LibraryAgentSocket, Timeout: 15 * time.Minute}
|
||||
handlers[libraryCaptureJobType] = func(ctx context.Context, job jobs.Job) error {
|
||||
var payload struct {
|
||||
Scope string `json:"scope"`
|
||||
CaptureJob string `json:"capture_job"`
|
||||
RequestedBy string `json:"requested_by"`
|
||||
}
|
||||
if err := json.Unmarshal(job.Payload, &payload); err != nil || (payload.Scope != "internal" && payload.Scope != "external") || payload.CaptureJob == "" {
|
||||
return fmt.Errorf("invalid library capture payload")
|
||||
}
|
||||
result, err := libraryagent.Capture(ctx, agentConfig, payload.Scope, payload.CaptureJob)
|
||||
if err != nil {
|
||||
log.Printf("library capture failed scope=%s capture_job=%s: %v", payload.Scope, payload.CaptureJob, err)
|
||||
return err
|
||||
}
|
||||
log.Printf("library capture completed scope=%s capture_job=%s snapshot=%s replay=%v requested_by=%s",
|
||||
payload.Scope, payload.CaptureJob, result.SnapshotID, result.Replay, payload.RequestedBy)
|
||||
return nil
|
||||
}
|
||||
// A crash can leave the source writer stopped: recover before taking work,
|
||||
// and keep the failure visible instead of pretending the worker is ready.
|
||||
go func() {
|
||||
recoveryCtx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
|
||||
defer cancel()
|
||||
if _, err := libraryagent.Recover(recoveryCtx, agentConfig); err != nil {
|
||||
log.Printf("library agent recovery check failed: %v", err)
|
||||
return
|
||||
}
|
||||
log.Printf("library agent reachable; freeze journals recovered")
|
||||
}()
|
||||
}
|
||||
if config.VersionHistoryGiteaBaseURL != "" {
|
||||
// 「版本记录」同步:匿名只读远端仓库的提交/tag,写本库快照。未配置来源就不注册,
|
||||
// 界面上的同步按钮也会显示"未接线",不会入队一个没人处理的作业。
|
||||
|
||||
Reference in New Issue
Block a user