f2efeb37b7
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
111 lines
4.8 KiB
C#
111 lines
4.8 KiB
C#
using Akka.Actor;
|
|
using Akka.Cluster;
|
|
using Akka.TestKit.Xunit2;
|
|
using Microsoft.Extensions.Logging.Abstractions;
|
|
using ZB.MOM.WW.ScadaBridge.Commons.Messages.Management;
|
|
using ZB.MOM.WW.ScadaBridge.SiteRuntime.Actors;
|
|
using ZB.MOM.WW.ScadaBridge.SiteRuntime.Persistence;
|
|
using ZB.MOM.WW.ScadaBridge.SiteRuntime.Scripts;
|
|
using ZB.MOM.WW.ScadaBridge.TestSupport;
|
|
|
|
namespace ZB.MOM.WW.ScadaBridge.SiteRuntime.Tests.Actors;
|
|
|
|
/// <summary>
|
|
/// UA1: cert-trust reconcile-on-join. When a site node (re)joins the cluster, the
|
|
/// Deployment Manager singleton reads its own trusted-peer store and pushes each
|
|
/// trusted certificate to the joining node's <see cref="CertStoreActor"/> so the
|
|
/// two per-node PKI stores converge — without this, a node that missed a trust
|
|
/// broadcast while it was down stays permanently divergent.
|
|
///
|
|
/// Needs a cluster provider (the DM subscribes to <c>MemberUp</c> in PreStart and
|
|
/// addresses the joined node via a remote actor path), so this lives in its own
|
|
/// cluster-enabled ActorSystem rather than the non-cluster DeploymentManagerActorTests.
|
|
/// </summary>
|
|
public class DeploymentManagerCertReconcileTests : TestKit, IDisposable
|
|
{
|
|
// In-memory TestTransport (not dot-netty): the cluster extension loads and
|
|
// SelfAddress is available, but no socket is bound and the node never has to
|
|
// form a real two-node cluster. Role must be "Site" (SiteClusterRole).
|
|
private const string ClusterConfig = @"
|
|
akka {
|
|
actor { provider = cluster }
|
|
remote {
|
|
enabled-transports = [""akka.remote.test""]
|
|
test {
|
|
transport-class = ""Akka.Remote.Transport.TestTransport, Akka.Remote""
|
|
applied-adapters = []
|
|
registry-key = dm-cert-reconcile-test
|
|
local-address = ""test://dm-cert@localhost:1""
|
|
maximum-payload-bytes = 128000b
|
|
scheme-identifier = test
|
|
}
|
|
}
|
|
cluster { roles = [""Site""] }
|
|
loglevel = WARNING
|
|
}";
|
|
|
|
private readonly SiteStorageService _storage;
|
|
private readonly ScriptCompilationService _compilationService;
|
|
private readonly SharedScriptLibrary _sharedScriptLibrary;
|
|
private readonly TestLocalDb _localDb;
|
|
|
|
public DeploymentManagerCertReconcileTests() : base(ClusterConfig, "dm-cert-reconcile")
|
|
{
|
|
_localDb = TestLocalDb.CreateTemp("dm-cert-test");
|
|
_storage = new SiteStorageService(
|
|
_localDb.Db, NullLogger<SiteStorageService>.Instance);
|
|
_storage.InitializeAsync().GetAwaiter().GetResult();
|
|
_compilationService = new ScriptCompilationService(
|
|
NullLogger<ScriptCompilationService>.Instance);
|
|
_sharedScriptLibrary = new SharedScriptLibrary(
|
|
_compilationService, NullLogger<SharedScriptLibrary>.Instance);
|
|
}
|
|
|
|
void IDisposable.Dispose()
|
|
{
|
|
// TestKit teardown first, so no in-flight actor can reach a disposed ILocalDb;
|
|
// then dispose the database before deleting — the master connection anchors the WAL.
|
|
Shutdown();
|
|
var path = _localDb.Path;
|
|
_localDb.Dispose();
|
|
TestLocalDb.DeleteFiles(path);
|
|
}
|
|
|
|
/// <summary>Forwards every message it receives to a probe, preserving the original sender.</summary>
|
|
private sealed class ForwardingActor : ReceiveActor
|
|
{
|
|
public ForwardingActor(IActorRef target) => ReceiveAny(msg => target.Forward(msg));
|
|
}
|
|
|
|
private IActorRef CreateDeploymentManager() =>
|
|
ActorOf(Props.Create(() => new DeploymentManagerActor(
|
|
_storage, _compilationService, _sharedScriptLibrary,
|
|
null, new SiteRuntimeOptions(), NullLogger<DeploymentManagerActor>.Instance,
|
|
null, null, null, null, null, null, null, null)));
|
|
|
|
[Fact]
|
|
public void SiteNodeJoined_PushesLocalTrustedCertsToJoinedNode()
|
|
{
|
|
// Stand a forwarder at the well-known cert-store name so both the local
|
|
// export Ask and the remote-path write land on our probe (self address in
|
|
// this single-node test resolves the remote path back to the local actor).
|
|
var certStoreProbe = CreateTestProbe();
|
|
Sys.ActorOf(Props.Create(() => new ForwardingActor(certStoreProbe.Ref)), CertStoreActor.WellKnownName);
|
|
|
|
var dm = CreateDeploymentManager();
|
|
|
|
dm.Tell(new DeploymentManagerActor.SiteNodeJoined(Cluster.Get(Sys).SelfAddress));
|
|
|
|
// 1) The singleton reads its own trusted store.
|
|
certStoreProbe.ExpectMsg<ExportLocalTrustedCerts>();
|
|
|
|
// 2) Feed the export back; the singleton pushes each cert to the joined node.
|
|
dm.Tell(new LocalCertExport(true, null,
|
|
new[] { new ExportedCert("ABC123", new byte[] { 1, 2, 3 }) }));
|
|
|
|
var write = certStoreProbe.ExpectMsg<WriteCertToLocalStore>(TimeSpan.FromSeconds(5));
|
|
Assert.Equal("ABC123", write.Thumbprint);
|
|
Assert.Equal(Convert.ToBase64String(new byte[] { 1, 2, 3 }), write.DerBase64);
|
|
}
|
|
}
|