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
193 lines
8.3 KiB
C#
193 lines
8.3 KiB
C#
using Akka.Actor;
|
|
using Akka.TestKit;
|
|
using Akka.TestKit.Xunit2;
|
|
using Microsoft.Extensions.Logging.Abstractions;
|
|
using ZB.MOM.WW.ScadaBridge.Commons.Messages.Streaming;
|
|
using ZB.MOM.WW.ScadaBridge.Commons.Types.Flattening;
|
|
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;
|
|
using System.Reflection;
|
|
using System.Text.Json;
|
|
|
|
namespace ZB.MOM.WW.ScadaBridge.SiteRuntime.Tests.Actors;
|
|
|
|
/// <summary>
|
|
/// Regression coverage for SiteRuntime-017 — the Instance Actor must not hand its
|
|
/// own live mutable <c>_attributes</c> dictionary by reference into the
|
|
/// <see cref="ScriptActor"/> / <see cref="AlarmActor"/> constructors.
|
|
///
|
|
/// Each child constructor runs on the child's own mailbox thread and seeds itself
|
|
/// by enumerating the dictionary it was given. The Instance Actor concurrently
|
|
/// mutates <c>_attributes</c> in <c>HandleAttributeValueChanged</c> /
|
|
/// <c>HandleTagValueUpdate</c>. <see cref="Dictionary{TKey,TValue}"/> is not safe
|
|
/// for concurrent read/write: if a child enumerates the shared live dictionary
|
|
/// while the Instance Actor inserts into it, the child constructor throws
|
|
/// <see cref="InvalidOperationException"/> ("collection was modified") — surfacing
|
|
/// as <c>ActorInitializationException</c> and stopping the child.
|
|
///
|
|
/// The fix: <c>CreateChildActors</c> snapshots <c>_attributes</c> once on the
|
|
/// Instance Actor thread (<c>new Dictionary<,>(_attributes)</c>) and hands
|
|
/// each child that private copy. This test asserts the isolation contract
|
|
/// directly and deterministically: every child's seed dictionary must be a
|
|
/// distinct object from the Instance Actor's live <c>_attributes</c>, while still
|
|
/// carrying the same point-in-time contents.
|
|
/// </summary>
|
|
public class InstanceActorChildAttributeRaceTests : TestKit, IDisposable
|
|
{
|
|
private readonly SiteStorageService _storage;
|
|
private readonly ScriptCompilationService _compilationService;
|
|
private readonly SharedScriptLibrary _sharedScriptLibrary;
|
|
private readonly SiteRuntimeOptions _options;
|
|
private readonly TestLocalDb _localDb;
|
|
|
|
public InstanceActorChildAttributeRaceTests()
|
|
{
|
|
_localDb = TestLocalDb.CreateTemp("instance-race-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);
|
|
_options = new SiteRuntimeOptions
|
|
{
|
|
MaxScriptCallDepth = 10,
|
|
ScriptExecutionTimeoutSeconds = 30
|
|
};
|
|
}
|
|
|
|
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);
|
|
}
|
|
|
|
private static FlattenedConfiguration BuildConfig(string instanceName)
|
|
=> new()
|
|
{
|
|
InstanceUniqueName = instanceName,
|
|
Attributes =
|
|
[
|
|
new ResolvedAttribute { CanonicalName = "Temperature", Value = "98.6", DataType = "Double" },
|
|
new ResolvedAttribute { CanonicalName = "Pressure", Value = "12", DataType = "Int32" },
|
|
new ResolvedAttribute { CanonicalName = "Label", Value = "Main Pump", DataType = "String" }
|
|
],
|
|
Scripts =
|
|
[
|
|
new ResolvedScript
|
|
{
|
|
CanonicalName = "WorkerA", Code = "return 1;",
|
|
TriggerType = "ValueChange",
|
|
TriggerConfiguration = "{\"AttributeName\":\"Temperature\"}"
|
|
},
|
|
new ResolvedScript
|
|
{
|
|
CanonicalName = "WorkerB", Code = "return 2;",
|
|
TriggerType = "ValueChange",
|
|
TriggerConfiguration = "{\"AttributeName\":\"Pressure\"}"
|
|
}
|
|
],
|
|
Alarms =
|
|
[
|
|
new ResolvedAlarm
|
|
{
|
|
CanonicalName = "HighTemp",
|
|
TriggerType = "ValueMatch",
|
|
TriggerConfiguration = "{}",
|
|
PriorityLevel = 1
|
|
}
|
|
]
|
|
};
|
|
|
|
/// <summary>Resolves the live actor instance behind a local <see cref="IActorRef"/>.</summary>
|
|
private static object GetActorInstance(IActorRef actorRef)
|
|
{
|
|
var cell = ((ActorRefWithCell)actorRef).Underlying;
|
|
// ActorCell exposes the actor instance via its internal Actor property.
|
|
var actorProp = cell.GetType().GetProperty(
|
|
"Actor", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
|
|
var instance = actorProp!.GetValue(cell);
|
|
Assert.NotNull(instance);
|
|
return instance!;
|
|
}
|
|
|
|
private static Dictionary<string, object?> GetPrivateAttributes(InstanceActor instance)
|
|
{
|
|
var field = typeof(InstanceActor).GetField(
|
|
"_attributes", BindingFlags.Instance | BindingFlags.NonPublic);
|
|
return (Dictionary<string, object?>)field!.GetValue(instance)!;
|
|
}
|
|
|
|
[Fact]
|
|
public async Task ChildActors_AreSeededFromAnIsolatedCopy_NotTheLiveAttributesDictionary()
|
|
{
|
|
const string instanceName = "RacePump";
|
|
var config = BuildConfig(instanceName);
|
|
|
|
var testRef = ActorOfAsTestActorRef<InstanceActor>(
|
|
Props.Create(() => new InstanceActor(
|
|
instanceName,
|
|
JsonSerializer.Serialize(config),
|
|
_storage,
|
|
_compilationService,
|
|
_sharedScriptLibrary,
|
|
null,
|
|
_options,
|
|
NullLogger<InstanceActor>.Instance)),
|
|
"instance");
|
|
|
|
var instanceActor = testRef.UnderlyingActor;
|
|
var liveAttributes = GetPrivateAttributes(instanceActor);
|
|
|
|
// Sanity: the children were created.
|
|
Assert.Equal(2, instanceActor.ScriptActorCount);
|
|
Assert.Equal(1, instanceActor.AlarmActorCount);
|
|
|
|
// Every child Script Actor must have been seeded from a dictionary that
|
|
// is NOT the Instance Actor's live _attributes field — otherwise the
|
|
// child constructor would enumerate a dictionary the Instance Actor
|
|
// mutates on another thread (SiteRuntime-017).
|
|
foreach (var name in new[] { "WorkerA", "WorkerB" })
|
|
{
|
|
var child = await Sys.ActorSelection(testRef.Path / $"script-{name}")
|
|
.ResolveOne(TimeSpan.FromSeconds(5));
|
|
var scriptActor = (ScriptActor)GetActorInstance(child);
|
|
|
|
Assert.NotNull(scriptActor.SeedAttributesReference);
|
|
Assert.False(
|
|
ReferenceEquals(scriptActor.SeedAttributesReference, liveAttributes),
|
|
$"Script Actor '{name}' was seeded from the Instance Actor's live " +
|
|
"_attributes dictionary by reference (SiteRuntime-017). It must be " +
|
|
"given a private snapshot copy.");
|
|
|
|
// The snapshot must still carry the same point-in-time contents.
|
|
Assert.Equal(liveAttributes.Count, scriptActor.SeedAttributesReference!.Count);
|
|
foreach (var kvp in liveAttributes)
|
|
{
|
|
Assert.True(scriptActor.SeedAttributesReference.ContainsKey(kvp.Key));
|
|
}
|
|
}
|
|
|
|
// The Alarm Actor must likewise be seeded from an isolated copy.
|
|
var alarmChild = await Sys.ActorSelection(testRef.Path / "alarm-HighTemp")
|
|
.ResolveOne(TimeSpan.FromSeconds(5));
|
|
var alarmActor = (AlarmActor)GetActorInstance(alarmChild);
|
|
|
|
Assert.NotNull(alarmActor.SeedAttributesReference);
|
|
Assert.False(
|
|
ReferenceEquals(alarmActor.SeedAttributesReference, liveAttributes),
|
|
"Alarm Actor 'HighTemp' was seeded from the Instance Actor's live " +
|
|
"_attributes dictionary by reference (SiteRuntime-017). It must be " +
|
|
"given a private snapshot copy.");
|
|
Assert.Equal(liveAttributes.Count, alarmActor.SeedAttributesReference!.Count);
|
|
}
|
|
}
|