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
@@ -1,6 +1,7 @@
|
||||
using Microsoft.Extensions.Logging.Abstractions;
|
||||
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;
|
||||
|
||||
@@ -18,12 +19,17 @@ public class DualNodeRecoveryTests
|
||||
// Scenario: both site nodes crash. First node to restart opens the existing
|
||||
// SQLite database and finds all buffered S&F messages intact.
|
||||
var dbPath = Path.Combine(Path.GetTempPath(), $"sf_dual_{Guid.NewGuid():N}.db");
|
||||
var connStr = $"Data Source={dbPath}";
|
||||
|
||||
// The store takes an ILocalDb; the "restarted node" opens its own local database
|
||||
// over the SAME file, which is how this test models recovery from disk.
|
||||
TestLocalDb? crashedDb = null;
|
||||
TestLocalDb? recoveryDb = null;
|
||||
|
||||
try
|
||||
{
|
||||
// Setup: populate SQLite with messages (simulating pre-crash state)
|
||||
var storage = new StoreAndForwardStorage(connStr, NullLogger<StoreAndForwardStorage>.Instance);
|
||||
crashedDb = TestLocalDb.Create(dbPath);
|
||||
var storage = new StoreAndForwardStorage(crashedDb.Db, NullLogger<StoreAndForwardStorage>.Instance);
|
||||
await storage.InitializeAsync();
|
||||
|
||||
var messageIds = new List<string>();
|
||||
@@ -48,7 +54,8 @@ public class DualNodeRecoveryTests
|
||||
|
||||
// Both nodes down — simulate by creating a fresh storage instance
|
||||
// (new process connecting to same SQLite file)
|
||||
var recoveryStorage = new StoreAndForwardStorage(connStr, NullLogger<StoreAndForwardStorage>.Instance);
|
||||
recoveryDb = TestLocalDb.Create(dbPath);
|
||||
var recoveryStorage = new StoreAndForwardStorage(recoveryDb.Db, NullLogger<StoreAndForwardStorage>.Instance);
|
||||
await recoveryStorage.InitializeAsync();
|
||||
|
||||
// Verify all messages are available for retry
|
||||
@@ -69,8 +76,10 @@ public class DualNodeRecoveryTests
|
||||
}
|
||||
finally
|
||||
{
|
||||
if (File.Exists(dbPath))
|
||||
File.Delete(dbPath);
|
||||
// Dispose before deleting — the master connections anchor the WAL sidecars.
|
||||
recoveryDb?.Dispose();
|
||||
crashedDb?.Dispose();
|
||||
TestLocalDb.DeleteFiles(dbPath);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -79,11 +88,14 @@ public class DualNodeRecoveryTests
|
||||
public async Task SiteTopology_DualCrash_ParkedMessagesPreserved()
|
||||
{
|
||||
var dbPath = Path.Combine(Path.GetTempPath(), $"sf_dual_parked_{Guid.NewGuid():N}.db");
|
||||
var connStr = $"Data Source={dbPath}";
|
||||
|
||||
TestLocalDb? crashedDb = null;
|
||||
TestLocalDb? recoveryDb = null;
|
||||
|
||||
try
|
||||
{
|
||||
var storage = new StoreAndForwardStorage(connStr, NullLogger<StoreAndForwardStorage>.Instance);
|
||||
crashedDb = TestLocalDb.Create(dbPath);
|
||||
var storage = new StoreAndForwardStorage(crashedDb.Db, NullLogger<StoreAndForwardStorage>.Instance);
|
||||
await storage.InitializeAsync();
|
||||
|
||||
// Mix of pending and parked messages
|
||||
@@ -114,7 +126,8 @@ public class DualNodeRecoveryTests
|
||||
});
|
||||
|
||||
// Dual crash recovery
|
||||
var recoveryStorage = new StoreAndForwardStorage(connStr, NullLogger<StoreAndForwardStorage>.Instance);
|
||||
recoveryDb = TestLocalDb.Create(dbPath);
|
||||
var recoveryStorage = new StoreAndForwardStorage(recoveryDb.Db, NullLogger<StoreAndForwardStorage>.Instance);
|
||||
await recoveryStorage.InitializeAsync();
|
||||
|
||||
var pendingCount = await recoveryStorage.GetMessageCountByStatusAsync(StoreAndForwardMessageStatus.Pending);
|
||||
@@ -134,8 +147,10 @@ public class DualNodeRecoveryTests
|
||||
}
|
||||
finally
|
||||
{
|
||||
if (File.Exists(dbPath))
|
||||
File.Delete(dbPath);
|
||||
// Dispose before deleting — the master connections anchor the WAL sidecars.
|
||||
recoveryDb?.Dispose();
|
||||
crashedDb?.Dispose();
|
||||
TestLocalDb.DeleteFiles(dbPath);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -176,11 +191,14 @@ public class DualNodeRecoveryTests
|
||||
{
|
||||
// CREATE TABLE IF NOT EXISTS is idempotent — safe to call on recovery
|
||||
var dbPath = Path.Combine(Path.GetTempPath(), $"sf_idempotent_{Guid.NewGuid():N}.db");
|
||||
var connStr = $"Data Source={dbPath}";
|
||||
|
||||
TestLocalDb? localDb1 = null;
|
||||
TestLocalDb? localDb2 = null;
|
||||
|
||||
try
|
||||
{
|
||||
var storage1 = new StoreAndForwardStorage(connStr, NullLogger<StoreAndForwardStorage>.Instance);
|
||||
localDb1 = TestLocalDb.Create(dbPath);
|
||||
var storage1 = new StoreAndForwardStorage(localDb1.Db, NullLogger<StoreAndForwardStorage>.Instance);
|
||||
await storage1.InitializeAsync();
|
||||
|
||||
await storage1.EnqueueAsync(new StoreAndForwardMessage
|
||||
@@ -196,7 +214,8 @@ public class DualNodeRecoveryTests
|
||||
});
|
||||
|
||||
// Second InitializeAsync on same DB should be safe (no data loss)
|
||||
var storage2 = new StoreAndForwardStorage(connStr, NullLogger<StoreAndForwardStorage>.Instance);
|
||||
localDb2 = TestLocalDb.Create(dbPath);
|
||||
var storage2 = new StoreAndForwardStorage(localDb2.Db, NullLogger<StoreAndForwardStorage>.Instance);
|
||||
await storage2.InitializeAsync();
|
||||
|
||||
var msg = await storage2.GetMessageByIdAsync("test-1");
|
||||
@@ -205,8 +224,10 @@ public class DualNodeRecoveryTests
|
||||
}
|
||||
finally
|
||||
{
|
||||
if (File.Exists(dbPath))
|
||||
File.Delete(dbPath);
|
||||
// Dispose before deleting — the master connections anchor the WAL sidecars.
|
||||
localDb2?.Dispose();
|
||||
localDb1?.Dispose();
|
||||
TestLocalDb.DeleteFiles(dbPath);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user