mirror of
https://github.com/logos-messaging/logos-messaging-nim.git
synced 2026-08-08 16:33:33 +00:00
* fix(persistency): own Persistency per node instead of a process-global singleton
The Persistency singleton (gPersistency) was allocated on whichever FFI
thread first ran waku.start; under --mm:refc its memory belonged to that
thread's heap, so a second library context adopting it read a foreign
heap (SIGSEGV in sdsPersistence -> openJob -> tables.rawGet), one
context's stop stole the other's SDS persistence, and a destroyed
context poisoned re-init with a different local-storage-path.
- remove the singleton (instance/reset/gPersistency); Persistency.new is
the public constructor, no lock needed (instances are thread-confined)
- own the instance as Waku.persistency: created and provided in
waku.start, cleared and closed in waku.stop on the owning thread
- expose it via a sync GetPersistency RequestBroker scoped to the node's
BrokerContext; sdsPersistence resolves through it (same-thread ref
return, no marshalling)
- add InMemoryStoragePath (":memory:") support: private in-memory SQLite
per job worker, for tests
- rewrite test_singleton as per-instance + broker coverage; rewrite
test_thread_affinity from a known-failing UB repro into a regression
guard (two in-memory jobs, worker spinup/teardown, cross-thread broker
denial) and register it in test_all; migrate remaining tests to
new/close; the FFI lifecycle test's stop-steals and different-paths
cases now pass against the real dylib
The FFI destroy-without-stop teardown gap remains tracked in #4108.
Fixes #4103
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
* fix(persistency): create the instance only after startup fully succeeds
waku.start has many error return paths; creating Persistency early meant
every one of them left the field set and the GetPersistency provider
installed with no teardown. Persistency.new is inert (no threads or
files until the first openJob) and every consumer runs post-start, so
creating and providing it as the last startup step removes the need for
any error-path cleanup entirely.
Addresses PR #4109 review feedback.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
* fix(persistency): create early for startup-stage restores, tear down on failed start
Creating the instance as the last startup step made it impossible for
any stage of start to restore persisted data (e.g. a future store-state
restore). Restore the original ordering -- create and provide the
instance first -- and cover every error return path of waku.start with a
success-flag defer that clears the provider and closes the instance.
Teardown is factored into closePersistency, shared by stop and the
failed-start path.
Addresses PR #4109 review discussion.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
* chore(persistency): address remaining Copilot review findings
- document that Persistency instances are thread-confined (not
thread-safe) on the type itself, pointing at the GetPersistency broker
as the sanctioned access path
- use tryRemoveFile for the FFI test's log cleanup so an unremovable
file cannot fail the test for unrelated reasons
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
* Fix comment
---------
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
185 lines
4.9 KiB
Nim
185 lines
4.9 KiB
Nim
{.used.}
|
|
|
|
import std/[os, times]
|
|
import chronos, results
|
|
import testutils/unittests
|
|
import logos_delivery/waku/persistency/persistency
|
|
|
|
proc payloadBytes(s: string): seq[byte] =
|
|
result = newSeq[byte](s.len)
|
|
for i, c in s:
|
|
result[i] = byte(c)
|
|
|
|
template str(b: seq[byte]): string =
|
|
var s = newString(b.len)
|
|
for i, x in b:
|
|
s[i] = char(x)
|
|
s
|
|
|
|
proc tmpRoot(label: string): string =
|
|
let p = getTempDir() / ("persistency_lookup_" & label & "_" & $epochTime().int)
|
|
removeDir(p)
|
|
p
|
|
|
|
# Bridge the persist->read race (writes are fire-and-forget in v1).
|
|
proc waitUntilExists(
|
|
p: Persistency, jobId, category: string, k: Key, timeoutMs = 1000
|
|
): Future[bool] {.async.} =
|
|
let deadline = epochTime() + (timeoutMs.float / 1000.0)
|
|
while epochTime() < deadline:
|
|
let r = await p.exists(jobId, category, k)
|
|
if r.isOk and r.get():
|
|
return true
|
|
await sleepAsync(chronos.milliseconds(2))
|
|
return false
|
|
|
|
suite "Persistency string-id lookup":
|
|
test "job(p, id) returns peJobNotFound when not open":
|
|
let root = tmpRoot("notfound")
|
|
defer:
|
|
removeDir(root)
|
|
let p = Persistency.new(root).get()
|
|
defer:
|
|
p.close()
|
|
|
|
let r = p.job("nope")
|
|
check r.isErr
|
|
check r.error.kind == peJobNotFound
|
|
|
|
test "job(p, id) returns the Job after openJob":
|
|
let root = tmpRoot("found")
|
|
defer:
|
|
removeDir(root)
|
|
let p = Persistency.new(root).get()
|
|
defer:
|
|
p.close()
|
|
|
|
let opened = p.openJob("alpha").get()
|
|
let looked = p.job("alpha").get()
|
|
check looked.id == "alpha"
|
|
check looked == opened # same ref, no need to peek at .context
|
|
|
|
test "hasJob mirrors p.job()":
|
|
let root = tmpRoot("has")
|
|
defer:
|
|
removeDir(root)
|
|
let p = Persistency.new(root).get()
|
|
defer:
|
|
p.close()
|
|
|
|
check not p.hasJob("x")
|
|
discard p.openJob("x")
|
|
check p.hasJob("x")
|
|
p.closeJob("x")
|
|
check not p.hasJob("x")
|
|
|
|
test "subscript [] returns the open Job":
|
|
let root = tmpRoot("subscript")
|
|
defer:
|
|
removeDir(root)
|
|
let p = Persistency.new(root).get()
|
|
defer:
|
|
p.close()
|
|
discard p.openJob("a").get()
|
|
let j = p["a"]
|
|
check j.id == "a"
|
|
|
|
asyncTest "string-lookup persistPut + get round-trips without a Job ref":
|
|
let root = tmpRoot("rw")
|
|
defer:
|
|
removeDir(root)
|
|
let p = Persistency.new(root).get()
|
|
defer:
|
|
p.close()
|
|
discard p.openJob("svc").get()
|
|
|
|
let k = key("c", 1'i64)
|
|
await p.persistPut("svc", "msg", k, payloadBytes("hello"))
|
|
let ckOk1 = await p.waitUntilExists("svc", "msg", k)
|
|
check ckOk1
|
|
|
|
let aw1 = await p.get("svc", "msg", k)
|
|
let got = aw1.get()
|
|
check got.isSome
|
|
check str(got.get) == "hello"
|
|
|
|
asyncTest "string-lookup reads short-circuit with peJobNotFound":
|
|
let root = tmpRoot("missingread")
|
|
defer:
|
|
removeDir(root)
|
|
let p = Persistency.new(root).get()
|
|
defer:
|
|
p.close()
|
|
|
|
let g = await p.get("nope", "msg", key("k"))
|
|
check g.isErr
|
|
check g.error.kind == peJobNotFound
|
|
|
|
let c = await p.count("nope", "msg", prefixRange(key("k")))
|
|
check c.isErr
|
|
check c.error.kind == peJobNotFound
|
|
|
|
let d = await p.deleteAcked("nope", "msg", key("k"))
|
|
check d.isErr
|
|
check d.error.kind == peJobNotFound
|
|
|
|
asyncTest "string-lookup writes to an unknown job are dropped, not raised":
|
|
let root = tmpRoot("missingwrite")
|
|
defer:
|
|
removeDir(root)
|
|
let p = Persistency.new(root).get()
|
|
defer:
|
|
p.close()
|
|
|
|
# Should not raise and should not leak any state.
|
|
await p.persistPut("ghost", "msg", key("k"), payloadBytes("v"))
|
|
await p.persistDelete("ghost", "msg", key("k"))
|
|
await p.persistEncoded("ghost", "msg", key("k"), 42'i64)
|
|
check not p.hasJob("ghost")
|
|
|
|
asyncTest "string-lookup persistEncoded round-trips a struct":
|
|
let root = tmpRoot("encoded")
|
|
defer:
|
|
removeDir(root)
|
|
type Item = object
|
|
tag: string
|
|
n: int64
|
|
|
|
let p = Persistency.new(root).get()
|
|
defer:
|
|
p.close()
|
|
discard p.openJob("e").get()
|
|
|
|
let k = key("items", 1'i64)
|
|
await p.persistEncoded("e", "msg", k, Item(tag: "alpha", n: 7))
|
|
let ckOk2 = await p.waitUntilExists("e", "msg", k)
|
|
check ckOk2
|
|
|
|
let aw2 = await p.get("e", "msg", k)
|
|
let got = aw2.get()
|
|
check got.isSome
|
|
check got.get == toPayload(Item(tag: "alpha", n: 7))
|
|
|
|
asyncTest "string-lookup scan returns the same rows as Job-form":
|
|
let root = tmpRoot("scan")
|
|
defer:
|
|
removeDir(root)
|
|
let p = Persistency.new(root).get()
|
|
defer:
|
|
p.close()
|
|
let j = p.openJob("s").get()
|
|
|
|
for i in 1'i64 .. 3:
|
|
await p.persistPut("s", "msg", key("c", i), payloadBytes($i))
|
|
let ckOk3 = await p.waitUntilExists("s", "msg", key("c", 3'i64))
|
|
check ckOk3
|
|
|
|
let aw3 = await p.scanPrefix("s", "msg", key("c"))
|
|
let viaId = aw3.get()
|
|
let aw4 = await j.scanPrefix("msg", key("c"))
|
|
let viaRef = aw4.get()
|
|
check viaId.len == viaRef.len
|
|
for i in 0 ..< viaId.len:
|
|
check viaId[i].key == viaRef[i].key
|
|
check viaId[i].payload == viaRef[i].payload
|