refactor(sf,site): both stores take ILocalDb instead of a connection string
Tasks 5 and 6 of the Phase 2 plan, committed together because their test
fallout is entangled — several fixtures construct both stores.
StoreAndForwardStorage and SiteStorageService now take ILocalDb. Connections
come from ILocalDb.CreateConnection(), which hands out an already-open,
pragma-configured connection carrying the zb_hlc_next() UDF the capture triggers
call; a raw connection would lack the UDF and every write to a replicated table
would fail closed. Deleted with the connection strings: S&F's
EnsureDatabaseDirectoryExists and its per-open busy_timeout pragma, and the site
service's BusyTimeoutFloorSeconds normalization — LocalDb owns all of it now.
DI: AddSiteRuntime's string overload is gone (nothing left to supply), so the
Host calls the no-arg form. ScadaBridge:Database:SiteDbPath and
StoreAndForwardOptions.SqliteDbPath survive only as the migrator's source
locations in Tasks 8/9.
Two things the plan did not anticipate, both worth reading:
1. FOUND A REAL LATENT DEFECT, from Phase 1, now fixed. The plan assumed
directory creation simply moved to LocalDb along with file ownership. It did
not: the LocalDb library never creates the parent directory, and
SqliteLocalDb opens the file eagerly in its constructor — so a missing
directory is a hard boot failure ("SQLite Error 14: unable to open database
file"), not a degraded start. The default site config points at the RELATIVE
path ./data/site-localdb.db, so any site node without a pre-existing data/
directory fails to boot. The docker rig escapes only because its volume mount
happens to create /app/data — a coincidence that would have hidden this until
a bare-metal or fresh deployment. This has been latent since Phase 1 made
LocalDb:Path required; deleting S&F's EnsureDatabaseDirectoryExists here
would have widened it. Re-established the guarantee at the layer that now
owns the path (SiteLocalDbDirectory.Ensure, called before AddZbLocalDb) and
pinned it with SiteLocalDbDirectoryTests. Non-vacuity is not assumed: two
tests written against the wrong assumption failed with exactly this
SQLite Error 14 before the fix existed.
2. Test fallout was ~7x the plan's estimate. The plan named "fixtures" in one
project; the constructor change actually reaches 40 files across 7 test
projects, and most used Mode=Memory;Cache=Shared — which LocalDb has no
equivalent for, so every one had to move to a real temp file. Rather than
copy the Phase 1 TestLocalDb fixture into 7 projects, added a shared
tests/ZB.MOM.WW.ScadaBridge.TestSupport library (not a test project) so the
WAL-sidecar cleanup and the "real, not stubbed" rationale live in one place.
Retargeted rather than deleted, in both directions: the S&F WAL test now asserts
against the LocalDb-backed store (WAL genuinely is LocalDb's job), while the
directory-creation test moved to Host.Tests (that guarantee is NOT LocalDb's).
SiteStorageServiceTests.Initialize_EnablesWalJournalMode got the same treatment.
DeploymentManagerMediumFindingsTests induced a persistence failure via an
unopenable path, which no longer reaches the assertion since the fixture now
throws first; it induces the same failure shape via an uninitialized store.
Verified: full solution build 0 warnings; SiteRuntime 532, Host 318,
AuditLog 355, ExternalSystemGateway 142, HealthMonitoring 97,
StoreAndForward 153 — 1597 passed, 0 failed.
Claude-Session: https://claude.ai/code/session_01BL2Vu1ESDQ9SCN4gVKkdts
This commit is contained in:
Joseph Doherty
@@ -4,6 +4,7 @@ using ZB.MOM.WW.ScadaBridge.Commons.Messages.Health;
|
||||
using ZB.MOM.WW.ScadaBridge.Commons.Messages.Streaming;
|
||||
using ZB.MOM.WW.ScadaBridge.Commons.Types.Enums;
|
||||
using ZB.MOM.WW.ScadaBridge.StoreAndForward;
|
||||
using ZB.MOM.WW.ScadaBridge.TestSupport;
|
||||
|
||||
namespace ZB.MOM.WW.ScadaBridge.IntegrationTests;
|
||||
|
||||
@@ -21,12 +22,18 @@ public class SiteFailoverTests
|
||||
// Simulates site failover: messages buffered in SQLite survive process restart.
|
||||
// The standby node picks up the same SQLite file and retries pending messages.
|
||||
var dbPath = Path.Combine(Path.GetTempPath(), $"sf_failover_{Guid.NewGuid():N}.db");
|
||||
var connStr = $"Data Source={dbPath}";
|
||||
|
||||
// The store takes an ILocalDb; each "node" opens its own local database over the
|
||||
// SAME file, which is how this test models the standby picking up the primary's
|
||||
// buffer after failover.
|
||||
TestLocalDb? primaryDb = null;
|
||||
TestLocalDb? standbyDb = null;
|
||||
|
||||
try
|
||||
{
|
||||
// Phase 1: Buffer messages on "primary" node
|
||||
var storage = new StoreAndForwardStorage(connStr, NullLogger<StoreAndForwardStorage>.Instance);
|
||||
primaryDb = TestLocalDb.Create(dbPath);
|
||||
var storage = new StoreAndForwardStorage(primaryDb.Db, NullLogger<StoreAndForwardStorage>.Instance);
|
||||
await storage.InitializeAsync();
|
||||
|
||||
var message = new StoreAndForwardMessage
|
||||
@@ -46,7 +53,8 @@ public class SiteFailoverTests
|
||||
await storage.EnqueueAsync(message);
|
||||
|
||||
// Phase 2: "Standby" node opens the same database (simulating failover)
|
||||
var standbyStorage = new StoreAndForwardStorage(connStr, NullLogger<StoreAndForwardStorage>.Instance);
|
||||
standbyDb = TestLocalDb.Create(dbPath);
|
||||
var standbyStorage = new StoreAndForwardStorage(standbyDb.Db, NullLogger<StoreAndForwardStorage>.Instance);
|
||||
await standbyStorage.InitializeAsync();
|
||||
|
||||
var pending = await standbyStorage.GetMessagesForRetryAsync();
|
||||
@@ -57,8 +65,10 @@ public class SiteFailoverTests
|
||||
}
|
||||
finally
|
||||
{
|
||||
if (File.Exists(dbPath))
|
||||
File.Delete(dbPath);
|
||||
// Dispose before deleting — the master connections anchor the WAL sidecars.
|
||||
standbyDb?.Dispose();
|
||||
primaryDb?.Dispose();
|
||||
TestLocalDb.DeleteFiles(dbPath);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -67,11 +77,14 @@ public class SiteFailoverTests
|
||||
public async Task StoreAndForward_ParkedMessages_SurviveFailover()
|
||||
{
|
||||
var dbPath = Path.Combine(Path.GetTempPath(), $"sf_parked_{Guid.NewGuid():N}.db");
|
||||
var connStr = $"Data Source={dbPath}";
|
||||
|
||||
TestLocalDb? primaryDb = null;
|
||||
TestLocalDb? standbyDb = null;
|
||||
|
||||
try
|
||||
{
|
||||
var storage = new StoreAndForwardStorage(connStr, NullLogger<StoreAndForwardStorage>.Instance);
|
||||
primaryDb = TestLocalDb.Create(dbPath);
|
||||
var storage = new StoreAndForwardStorage(primaryDb.Db, NullLogger<StoreAndForwardStorage>.Instance);
|
||||
await storage.InitializeAsync();
|
||||
|
||||
var parkedMsg = new StoreAndForwardMessage
|
||||
@@ -93,7 +106,8 @@ public class SiteFailoverTests
|
||||
await storage.EnqueueAsync(parkedMsg);
|
||||
|
||||
// Standby opens same DB
|
||||
var standbyStorage = new StoreAndForwardStorage(connStr, NullLogger<StoreAndForwardStorage>.Instance);
|
||||
standbyDb = TestLocalDb.Create(dbPath);
|
||||
var standbyStorage = new StoreAndForwardStorage(standbyDb.Db, NullLogger<StoreAndForwardStorage>.Instance);
|
||||
await standbyStorage.InitializeAsync();
|
||||
|
||||
var (parked, count) = await standbyStorage.GetParkedMessagesAsync();
|
||||
@@ -102,8 +116,10 @@ public class SiteFailoverTests
|
||||
}
|
||||
finally
|
||||
{
|
||||
if (File.Exists(dbPath))
|
||||
File.Delete(dbPath);
|
||||
// Dispose before deleting — the master connections anchor the WAL sidecars.
|
||||
standbyDb?.Dispose();
|
||||
primaryDb?.Dispose();
|
||||
TestLocalDb.DeleteFiles(dbPath);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -160,11 +176,14 @@ public class SiteFailoverTests
|
||||
public async Task StoreAndForward_BufferDepth_ReportedAfterFailover()
|
||||
{
|
||||
var dbPath = Path.Combine(Path.GetTempPath(), $"sf_depth_{Guid.NewGuid():N}.db");
|
||||
var connStr = $"Data Source={dbPath}";
|
||||
|
||||
TestLocalDb? primaryDb = null;
|
||||
TestLocalDb? standbyDb = null;
|
||||
|
||||
try
|
||||
{
|
||||
var storage = new StoreAndForwardStorage(connStr, NullLogger<StoreAndForwardStorage>.Instance);
|
||||
primaryDb = TestLocalDb.Create(dbPath);
|
||||
var storage = new StoreAndForwardStorage(primaryDb.Db, NullLogger<StoreAndForwardStorage>.Instance);
|
||||
await storage.InitializeAsync();
|
||||
|
||||
// Enqueue messages in different categories
|
||||
@@ -199,7 +218,8 @@ public class SiteFailoverTests
|
||||
}
|
||||
|
||||
// After failover, standby reads buffer depths
|
||||
var standbyStorage = new StoreAndForwardStorage(connStr, NullLogger<StoreAndForwardStorage>.Instance);
|
||||
standbyDb = TestLocalDb.Create(dbPath);
|
||||
var standbyStorage = new StoreAndForwardStorage(standbyDb.Db, NullLogger<StoreAndForwardStorage>.Instance);
|
||||
await standbyStorage.InitializeAsync();
|
||||
|
||||
var depths = await standbyStorage.GetBufferDepthByCategoryAsync();
|
||||
@@ -208,8 +228,10 @@ public class SiteFailoverTests
|
||||
}
|
||||
finally
|
||||
{
|
||||
if (File.Exists(dbPath))
|
||||
File.Delete(dbPath);
|
||||
// Dispose before deleting — the master connections anchor the WAL sidecars.
|
||||
standbyDb?.Dispose();
|
||||
primaryDb?.Dispose();
|
||||
TestLocalDb.DeleteFiles(dbPath);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user