logos-messaging-nim/waku/persistency/backend_thread.nim

272 lines
9.1 KiB
Nim
Raw Normal View History

feat: persistency (#3880) * persistency: per-job SQLite-backed storage layer (singleton, brokered) Adds a backend-neutral CRUD library at waku/persistency/, plus the nim-brokers dependency swap that enables it. Architecture (ports-and-adapters): * Persistency: process-wide singleton, one root directory. * Job: one tenant, one DB file, one worker thread, one BrokerContext. * Backend: SQLite via waku/common/databases/db_sqlite. Uniform schema kv(category BLOB, key BLOB, payload BLOB) PRIMARY KEY (category, key) WITHOUT ROWID, WAL mode. * Writes are fire-and-forget via EventBroker(mt) PersistEvent. * Reads are async via five RequestBroker(mt) shapes (KvGet, KvExists, KvScan, KvCount, KvDelete). Reads return Result[T, PersistencyError]. * One storage thread per job; tenants isolated by BrokerContext. Public surface (waku/persistency/persistency.nim): Persistency.instance(rootDir) / Persistency.instance() / Persistency.reset() p.openJob(id) / p.closeJob(id) / p.dropJob(id) / p.close() p.job(id) / p[id] / p.hasJob(id) Writes (Job form & string-id form, fire-and-forget): persist / persistPut / persistDelete / persistEncoded Reads (Job form & string-id form, async Result): get / exists / scan / scanPrefix / count / deleteAcked Key & payload encoding (keys.nim, payload.nim): * encodePart family + variadic key(...) / payload(...) macros + single-value toKey / toPayload. * Primitives: string and openArray[byte] are 2-byte BE length + bytes; int{8..64} are sign-flipped 8-byte BE; uint{16..64} are 8-byte BE; bool/byte/char are 1 byte; enums are int64(ord(v)). * Generic encodePart[T: tuple | object] recurses through fields() so any composite Nim type is encodable without ceremony. * Stable across Nim/C compiler upgrades: no sizeof, no memcpy, no cast on pointers, no host-endianness dependency. * `rawKey(bytes)` + `persistPut(..., openArray[byte])` let callers bypass the built-in encoder with their own format (CBOR, protobuf...). Lifecycle: * Persistency.new is private; Persistency.instance is the only public constructor. Same rootDir is idempotent; conflicting rootDir is peInvalidArgument. Persistency.reset for test/restart paths. * openJob opens-or-creates the per-job SQLite file; an existing file is reused with its data preserved. * Teardown integration: Persistency.instance registers a Teardown MultiRequestBroker provider that closes all jobs and clears the singleton slot when Waku.stop() issues Teardown.request. Internal layering: types.nim pure value types (Key, KeyRange, KvRow, TxOp, PersistencyError) keys.nim encodePart primitives + key(...) macro payload.nim toPayload + payload(...) macro schema.nim CREATE TABLE + connection pragmas + user_version backend_sqlite.nim KvBackend, applyOps (single source of write SQL), getOne/existsOne/deleteOne, scanRange (asc/desc, half-open ranges, open-ended stop), countRange backend_comm.nim EventBroker(mt) PersistEvent + 5 RequestBroker(mt) declarations; encodeErr/decodeErr boundary helpers backend_thread.nim startStorageThread / stopStorageThread (shared allocShared0 arg, cstring dbPath, atomic ready/shutdown flags); per-thread provider registration persistency.nim Persistency + Job types, singleton state, public facade ../requests/lifecycle_requests.nim Teardown MultiRequestBroker Tests (69 cases, all passing): test_keys.nim sort-order invariants (length-prefix strings, sign-flipped ints, composite tuples, prefix range) test_backend.nim round-trip / replace / delete-return-value / batched atomicity / asc-desc-half-open-open- ended scans / category isolation / batch txDelete test_lifecycle.nim open-or-create rootDir / non-dir collision / reopen across sessions / idempotent openJob / two-tenant parallel isolation / closeJob joins worker / dropJob removes file / acked delete test_facade.nim put-then-get / atomic batch / scanPrefix asc/desc / deleteAcked hit-miss / fire-and-forget delete / two-tenant facade isolation test_encoding.nim tuple/named-tuple/object keys, embedded Key, enum encoding, field-major composite sort, payload struct encoding, end-to-end struct round-trip through SQLite test_string_lookup.nim peJobNotFound semantics / hasJob / subscript / persistPut+get via id / reads short-circuit / writes drop+warn / persistEncoded via id / scan parity Job-ref vs id test_singleton.nim idempotent same-rootDir / different-rootDir rejection / no-arg instance lifecycle / reset retargets / reset idempotence / Teardown.request end-to-end Prerequisite delivered in the same series: replace the in-tree broker implementation with the external nim-brokers package; update all broker call-sites (waku_filter_v2, waku_relay, waku_rln_relay, delivery_service, peer_manager, requests/*, factory/*, api tests, etc.) to the new package API; chat2 made to compile again. Note: SDS adapter (Phase 5 of the design) is deferred -- nim-sds is still developed side-by-side and the persistency layer is intentionally SDS-agnostic. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * persistency: pin nim-brokers by URL+commit (workaround for stale registry) The bare `brokers >= 2.0.1` form cannot resolve on machines where the local nimble SAT solver enumerates only the registry-recorded 0.1.0 for brokers. The nim-lang/packages entry for `brokers` carries no per-tag metadata (only the URL), so until that registry entry is refreshed the SAT solver clamps the available-versions list to 0.1.0 and rejects the >= 2.0.1 constraint -- even though pkgs2 and pkgcache both have v2.0.1 cloned locally. Pinning by URL+commit bypasses the registry path entirely. Inline comment in waku.nimble documents the situation and the path back to the bare form once nim-lang/packages is updated. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * persistency: nph format pass Run `nph` on all 57 Nim files touched by this PR. Pure formatting: 17 files re-styled, no semantic change. Suite still 69/69. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * Fix build, add local-storage-path config, lazy init of Persistency from Waku start * fix: fix nix deps * fixes for nix build, regenerate deps * reverting accidental dependency changes * Fixing deps * Apply suggestions from code review Co-authored-by: Ivan FB <128452529+Ivansete-status@users.noreply.github.com> * persistency tests: migrate to suite / asyncTest / await Match the in-tree test convention (procSuite -> suite, sync test + waitFor -> asyncTest + await): - procSuite "X": -> suite "X": - For tests doing async work: test -> asyncTest, waitFor -> await. - Poll helpers (proc waitFor(t: Job, ...) in test_lifecycle.nim, proc waitUntilExists(...) in test_facade.nim and test_string_lookup.nim) -> Future[bool] {.async.}, internal `waitFor X` -> `await X`, internal `sleep(N)` -> `await sleepAsync(chronos.milliseconds(N))`. - Renamed test_lifecycle.nim's helper proc from `waitFor(t: Job, ...)` -> `pollExists(t: Job, ...)`; the previous name shadowed chronos.waitFor in the chronos macro expansion. - `chronos.milliseconds(N)` explicitly qualified because `std/times` also exports `milliseconds` (returning TimeInterval, not Duration). - `check await x` -> `let okN = await x; check okN` to dodge chronos's "yield in expr not lowered" with await-as-macro-argument. - `(await x).foo()` -> `let awN = await x; ... awN.foo() ...` for the same reason. waku/persistency/persistency.nim: nph also pulled the proc signatures across multiple lines; restored explicit `Future[void] {.async.}` return types after the colon (an intermediate nph pass had elided them). Suite: 71 / 71 OK against the new async write surface. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * use idiomatic valueOr instead of ifs * Reworked persistency shutdown, remove not necessary teardown mechanism * Use const for DefaultStoragePath * format to follow coding guidelines - no use of result and explicit returns - no functional change --------- Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com> Co-authored-by: Ivan FB <128452529+Ivansete-status@users.noreply.github.com>
2026-05-16 00:09:07 +02:00
## Internal per-job storage thread.
##
## Exposes two operations to ``persistency.nim``:
## * ``startStorageThread(ctx, dbPath)`` — spawn one worker, block until
## it signals ready (or error). Returns a ``JobRuntime``.
## * ``stopStorageThread(rt)`` — signal shutdown, join, free.
##
## The worker:
## 1. installs the supplied BrokerContext on its threadvar
## 2. opens the SQLite backend (creating the file + schema if absent)
## 3. registers the PersistEvent listener and the 5 RequestBroker
## providers under that context
## 4. runs the chronos event loop until shutdown is signalled
## 5. clears providers + listeners, closes the backend
##
## The arg struct lives in shared memory (``allocShared0``). The dbPath is
## carried as a shared cstring buffer rather than a Nim string to avoid
## refc ref-count traffic across threads. The arg is freed by
## ``stopStorageThread`` after ``joinThread`` returns.
import std/[options, os]
import std/atomics # std/concurrency/atomics is the same module in Nim 2.2
import chronos, chronicles, results
import brokers/[event_broker, request_broker, broker_context]
import ./[types, backend_comm, backend_sqlite]
export broker_context, backend_comm
logScope:
topics = "persistency thread"
type
ReadyState {.pure.} = enum
Pending = 0
Ready = 1
Error = 2
StorageThreadArg = object
ctx: BrokerContext
dbPath: cstring ## allocShared0'd; freed in closeJob
dbPathLen: int ## bytes including the trailing NUL
shutdownFlag: Atomic[int]
readyFlag: Atomic[int] ## values from ReadyState
errBuf: array[256, char] ## last error message, NUL-terminated
StorageThread = Thread[ptr StorageThreadArg]
# ── arg helpers ─────────────────────────────────────────────────────────
proc allocArg(ctx: BrokerContext, dbPath: string): ptr StorageThreadArg =
let arg = cast[ptr StorageThreadArg](allocShared0(sizeof(StorageThreadArg)))
arg.ctx = ctx
arg.dbPathLen = dbPath.len + 1
arg.dbPath = cast[cstring](allocShared0(arg.dbPathLen))
if dbPath.len > 0:
copyMem(arg.dbPath, unsafeAddr dbPath[0], dbPath.len)
return arg
proc freeArg(a: ptr StorageThreadArg) =
if a.isNil():
return
if a.dbPath != nil:
deallocShared(a.dbPath)
deallocShared(a)
proc recordErr(a: ptr StorageThreadArg, msg: string) =
let n = min(msg.len, a.errBuf.len - 1)
for i in 0 ..< n:
a.errBuf[i] = msg[i]
a.errBuf[n] = '\0'
a.readyFlag.store(int(ReadyState.Error), moRelease)
proc errMsg(a: ptr StorageThreadArg): string =
$cast[cstring](a.errBuf[0].addr)
# ── provider closures ───────────────────────────────────────────────────
proc encode(e: PersistencyError): string =
encodeErr(e)
template unwrapErr(r: untyped): string =
## Disambiguates Result's `error` accessor from chronicles' `error` macro
## by binding through an explicitly-typed local before stringifying.
block:
let pe: PersistencyError = r.error()
encode(pe)
proc registerProviders(backend: KvBackend, ctx: BrokerContext): Result[void, string] =
## Wires the 5 RequestBroker providers + the PersistEvent listener.
## All closures capture `backend` by reference (it lives for the entire
## thread lifetime).
proc onGet(category: string, key: Key): Future[Result[KvGet, string]] {.async.} =
let r = backend.getOne(category, key)
if r.isErr:
return err(unwrapErr(r))
return ok(KvGet(value: r.get()))
proc onExists(
category: string, key: Key
): Future[Result[KvExists, string]] {.async.} =
let r = backend.existsOne(category, key)
if r.isErr:
return err(unwrapErr(r))
return ok(KvExists(value: r.get()))
proc onScan(
category: string, range: KeyRange, reverse: bool
): Future[Result[KvScan, string]] {.async.} =
let r = backend.scanRange(category, range, reverse)
if r.isErr:
return err(unwrapErr(r))
return ok(KvScan(rows: r.get()))
proc onCount(
category: string, range: KeyRange
): Future[Result[KvCount, string]] {.async.} =
let r = backend.countRange(category, range)
if r.isErr:
return err(unwrapErr(r))
return ok(KvCount(n: r.get()))
proc onDelete(
category: string, key: Key
): Future[Result[KvDelete, string]] {.async.} =
let r = backend.deleteOne(category, key)
if r.isErr:
return err(unwrapErr(r))
return ok(KvDelete(existed: r.get()))
# PersistEvent listener — fire-and-forget; we log on backend failure
# because the caller has no return channel.
proc onPersist(ev: PersistEvent): Future[void] {.async: (raises: []).} =
let r = backend.applyOps(ev.ops)
if r.isErr:
let pe: PersistencyError = r.error()
error "PersistEvent applyOps failed",
error = pe.msg, kind = $pe.kind, opCount = ev.ops.len
KvGet.setProvider(ctx, onGet).isOkOr:
return err("KvGet.setProvider: " & error)
let existsRes = KvExists.setProvider(ctx, onExists)
if existsRes.isErr:
return err("KvExists.setProvider: " & existsRes.error())
let scanRes = KvScan.setProvider(ctx, onScan)
if scanRes.isErr:
return err("KvScan.setProvider: " & scanRes.error())
let countRes = KvCount.setProvider(ctx, onCount)
if countRes.isErr:
return err("KvCount.setProvider: " & countRes.error())
let delRes = KvDelete.setProvider(ctx, onDelete)
if delRes.isErr:
return err("KvDelete.setProvider: " & delRes.error())
let listenRes = PersistEvent.listen(ctx, onPersist)
if listenRes.isErr:
return err("PersistEvent.listen: " & listenRes.error())
return ok()
proc clearProviders(ctx: BrokerContext) =
KvGet.clearProvider(ctx)
KvExists.clearProvider(ctx)
KvScan.clearProvider(ctx)
KvCount.clearProvider(ctx)
KvDelete.clearProvider(ctx)
PersistEvent.dropAllListeners(ctx)
# ── thread proc ─────────────────────────────────────────────────────────
proc storageThreadMain(arg: ptr StorageThreadArg) {.thread.} =
## Worker thread entrypoint. Errors during setup are surfaced via
## arg.errBuf + readyFlag=ReadyState.Error; the spawning thread checks both.
setThreadBrokerContext(arg.ctx)
let path = $arg.dbPath
let backendRes =
try:
openBackend(path)
except CatchableError as e:
arg.recordErr("openBackend raised: " & e.msg)
return
if backendRes.isErr:
arg.recordErr("openBackend: " & backendRes.error.msg)
return
let backend = backendRes.get()
let regRes =
try:
registerProviders(backend, arg.ctx)
except CatchableError as e:
backend.close()
arg.recordErr("registerProviders raised: " & e.msg)
return
if regRes.isErr:
backend.close()
arg.recordErr(regRes.error)
return
arg.readyFlag.store(int(ReadyState.Ready), moRelease)
proc awaitShutdown() {.async.} =
while arg.shutdownFlag.load(moAcquire) != 1:
try:
await sleepAsync(milliseconds(10))
except CatchableError:
discard
try:
waitFor awaitShutdown()
except CatchableError as e:
error "storage thread loop crashed", err = e.msg
clearProviders(arg.ctx)
backend.close()
# ── lifecycle ───────────────────────────────────────────────────────────
type JobRuntime* = ref object
## Opaque per-job runtime owned by `persistency.nim`. Holds the typed
## Thread handle + shared arg pointer so closeJob can shut the worker
## down. Created by `startStorageThread` and torn down by
## `stopStorageThread`.
arg*: ptr StorageThreadArg
thread*: StorageThread
proc startStorageThread*(
ctx: BrokerContext, dbPath: string
): Result[JobRuntime, PersistencyError] =
## Spawn a storage worker for one job. Blocks until the worker either
## signals ready (returns the runtime) or signals error (joins, frees,
## returns peBackend with the worker's error message).
let arg = allocArg(ctx, dbPath)
arg.shutdownFlag.store(0, moRelease)
arg.readyFlag.store(int(ReadyState.Pending), moRelease)
var rt = JobRuntime(arg: arg)
try:
createThread(rt.thread, storageThreadMain, arg)
except ResourceExhaustedError as e:
freeArg(arg)
return err(persistencyErr(peBackend, "createThread: " & e.msg))
# Spin-wait for ready or error. The thread does its setup synchronously
# before signaling, so this is bounded by SQLite open time.
while true:
let s = arg.readyFlag.load(moAcquire)
if s == int(ReadyState.Ready):
return ok(rt)
if s == int(ReadyState.Error):
let msg = errMsg(arg)
joinThread(rt.thread)
freeArg(arg)
return err(persistencyErr(peBackend, msg))
sleep(1)
proc stopStorageThread*(rt: JobRuntime) =
## Signal shutdown, join the worker, free the shared arg. Idempotent in
## the sense that it tolerates a nil arg (already stopped).
if rt == nil or rt.arg == nil:
return
rt.arg.shutdownFlag.store(1, moRelease)
joinThread(rt.thread)
freeArg(rt.arg)
rt.arg = nil