mirror of
https://github.com/Kpa-clawbot/meshcore-analyzer.git
synced 2026-05-24 11:05:17 +00:00
9383201c07
Red commit:
https://github.com/Kpa-clawbot/CoreScope/commit/eae179b99b5fd34924547632aa8f8025c405aa53
(CI: pending — opens with this PR)
Finishes #1283. RED test `TestServerSourceHasNoCachedRWCalls` goes from
failing (13 writer call-sites) to GREEN (zero). Per #1287 Option 4
(https://github.com/Kpa-clawbot/CoreScope/issues/1287#issuecomment-4485099992):
ingestor owns the neighbor graph build + persist; server reads the
snapshot.
**Category A — Schema migrations** → new `internal/dbschema` package.
`dbschema.Apply(rw)` runs in `cmd/ingestor` startup (in `OpenStore`).
`dbschema.AssertReady(ro)` runs in `cmd/server/main.go` and
FATAL-LOG-EXITS if any expected column/index/table is missing — the
operator must restart the ingestor first. Covers indexes,
`neighbor_edges`, `observations.resolved_path`,
`observers.{inactive,last_packet_at,iata}`,
`(inactive_)nodes.foreign_advert`, `transmissions.from_pubkey`.
**Category B — Backfill** → ingestor.
`BackfillFromPubkey` and observer-blacklist soft-delete moved to
`cmd/ingestor/maintenance.go`. Server keeps an inert
`fromPubkeyBackfillSnapshot` stub for `/api/healthz` API compatibility.
**Category C — Neighbor-graph persistence (Option 4)** → ingestor
writes, server reads.
- Ingestor (`cmd/ingestor/neighbor_builder.go`): every 60s scans
`observations + transmissions`, extracts edges (originator↔first-hop for
ADVERTs; observer↔last-hop for all), resolves hop prefixes via a
node-table prefix index, upserts into `neighbor_edges`.
- Server (`cmd/server/neighbor_recomputer.go`): every 60s re-reads
`neighbor_edges` and atomic-swaps the resulting `NeighborGraph` into
`s.graph`. Initial load is synchronous on startup. All server-side
incremental edge writers (the two `asyncPersistResolvedPathsAndEdges`
paths in `cmd/server/store.go`) are gone.
- Neighbor-edge daily prune (`PruneNeighborEdges`) moved to ingestor.
**Why Option 4**: clean read/write separation, no startup CPU spike
(server loads existing snapshot instead of rebuilding from history), no
IPC/delta-protocol churn. Staleness budget ~60s — same model as the
analytics recomputers in #1240 / #1248 / #672 axis 2.
**Recomputer interval default for neighbor graph**: 60s
(`NeighborGraphRecomputerDefaultInterval`,
`NeighborEdgesBuilderInterval`).
**Invariants added**:
- `TestServerSourceHasNoCachedRWCalls` (RED commit eae179b9): grep
enforces zero `cachedRW(`, `mode=rw`, or `sql.Open(_journal_mode=WAL…)`
in non-test `cmd/server/` sources.
- `TestServerStartupRequiresMigratedSchema`: server refuses to start
against an unmigrated DB.
- `TestNeighborGraphRecomputerLoadsSnapshot`: post-write snapshot is
picked up on the next refresh.
- `TestNeighborEdgesBuilderUpsertsFromObservations`: end-to-end pipeline
writes the expected edge.
`grep cachedRW cmd/server/*.go | grep -v _test.go` → 0 matches.
Fixes #1287.
---------
Co-authored-by: MeshCore Bot <bot@meshcore.local>
Co-authored-by: Kpa-clawbot <Kpa-clawbot@users.noreply.github.com>
Co-authored-by: corescope-bot <bot@corescope.local>
56 lines
1.4 KiB
Go
56 lines
1.4 KiB
Go
// Command migrate runs all dbschema migrations against a SQLite
|
|
// CoreScope database and exits. Used by CI / one-shot tooling to bring
|
|
// an unmigrated fixture (or a fresh DB) up to the schema shape the
|
|
// read-only server (cmd/server) requires via dbschema.AssertReady.
|
|
//
|
|
// In production the ingestor (cmd/ingestor) runs dbschema.Apply at
|
|
// startup before subscribing to MQTT — this binary exists so CI's E2E
|
|
// job can migrate the e2e-fixture.db without booting the full ingestor
|
|
// (which needs MQTT brokers).
|
|
//
|
|
// Usage:
|
|
//
|
|
// migrate -db path/to/file.db
|
|
package main
|
|
|
|
import (
|
|
"database/sql"
|
|
"flag"
|
|
"log"
|
|
|
|
"github.com/meshcore-analyzer/dbschema"
|
|
_ "modernc.org/sqlite"
|
|
)
|
|
|
|
func main() {
|
|
dbPath := flag.String("db", "", "path to SQLite database to migrate (required)")
|
|
flag.Parse()
|
|
|
|
if *dbPath == "" {
|
|
log.Fatalf("[migrate] -db is required")
|
|
}
|
|
|
|
log.SetFlags(log.LstdFlags | log.Lmsgprefix)
|
|
log.SetPrefix("[migrate] ")
|
|
|
|
db, err := sql.Open("sqlite", *dbPath)
|
|
if err != nil {
|
|
log.Fatalf("open %s: %v", *dbPath, err)
|
|
}
|
|
defer db.Close()
|
|
|
|
if err := db.Ping(); err != nil {
|
|
log.Fatalf("ping %s: %v", *dbPath, err)
|
|
}
|
|
|
|
if err := dbschema.Apply(db, log.Printf); err != nil {
|
|
log.Fatalf("dbschema.Apply: %v", err)
|
|
}
|
|
|
|
if err := dbschema.AssertReady(db); err != nil {
|
|
log.Fatalf("dbschema.AssertReady after Apply: %v (this is a bug — Apply did not produce a ready schema)", err)
|
|
}
|
|
|
|
log.Printf("OK: %s is migrated and ready", *dbPath)
|
|
}
|