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
173 lines
6.8 KiB
C#
173 lines
6.8 KiB
C#
using Akka.Actor;
|
|
using Akka.TestKit.Xunit2;
|
|
using Microsoft.Extensions.Logging.Abstractions;
|
|
using ZB.MOM.WW.ScadaBridge.Commons.Messages.RemoteQuery;
|
|
using ZB.MOM.WW.ScadaBridge.Commons.Types;
|
|
using ZB.MOM.WW.ScadaBridge.Commons.Types.Enums;
|
|
using ZB.MOM.WW.ScadaBridge.TestSupport;
|
|
|
|
namespace ZB.MOM.WW.ScadaBridge.StoreAndForward.Tests;
|
|
|
|
/// <summary>
|
|
/// Task 5 (#22 Retry/Discard relay): tests the site-side execution of a
|
|
/// central→site <see cref="RetryParkedOperation"/> / <see cref="DiscardParkedOperation"/>
|
|
/// relay command on the <see cref="ParkedMessageHandlerActor"/>. The cached
|
|
/// call's S&F buffer message id is the <see cref="TrackedOperationId"/>, so
|
|
/// the handler resolves the parked row directly from the tracked id and reuses
|
|
/// the existing parked-message Retry/Discard primitive. A non-parked operation
|
|
/// must be a safe no-op (<c>Applied=false</c>), never a corruption.
|
|
/// </summary>
|
|
public class ParkedOperationRelayTests : TestKit, IAsyncLifetime, IDisposable
|
|
{
|
|
private readonly TestLocalDb _localDb;
|
|
private readonly StoreAndForwardStorage _storage;
|
|
private readonly StoreAndForwardService _service;
|
|
|
|
public ParkedOperationRelayTests()
|
|
{
|
|
_localDb = TestLocalDb.CreateTemp("RelayTests");
|
|
|
|
_storage = new StoreAndForwardStorage(_localDb.Db, NullLogger<StoreAndForwardStorage>.Instance);
|
|
|
|
var options = new StoreAndForwardOptions
|
|
{
|
|
DefaultRetryInterval = TimeSpan.Zero,
|
|
DefaultMaxRetries = 1,
|
|
RetryTimerInterval = TimeSpan.FromMinutes(10),
|
|
ReplicationEnabled = false,
|
|
};
|
|
|
|
_service = new StoreAndForwardService(
|
|
_storage, options, NullLogger<StoreAndForwardService>.Instance);
|
|
}
|
|
|
|
public async Task InitializeAsync() => await _storage.InitializeAsync();
|
|
|
|
public Task DisposeAsync() => Task.CompletedTask;
|
|
|
|
protected override void Dispose(bool disposing)
|
|
{
|
|
if (disposing)
|
|
{
|
|
var path = _localDb.Path;
|
|
_localDb.Dispose();
|
|
TestLocalDb.DeleteFiles(path);
|
|
}
|
|
|
|
base.Dispose(disposing);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Enqueues a cached-call message whose S&F id is the supplied
|
|
/// <see cref="TrackedOperationId"/> and parks it via the retry sweep.
|
|
/// </summary>
|
|
private async Task ParkCachedCallAsync(TrackedOperationId id)
|
|
{
|
|
_service.RegisterDeliveryHandler(
|
|
StoreAndForwardCategory.ExternalSystem, _ => throw new HttpRequestException("always fails"));
|
|
await _service.EnqueueAsync(
|
|
StoreAndForwardCategory.ExternalSystem, "ERP.GetOrder", """{}""",
|
|
maxRetries: 1, messageId: id.ToString());
|
|
await _service.RetryPendingMessagesAsync();
|
|
}
|
|
|
|
[Fact]
|
|
public async Task RetryParkedOperation_ParkedCachedCall_ResetsToPendingAndApplied()
|
|
{
|
|
var id = TrackedOperationId.New();
|
|
await ParkCachedCallAsync(id);
|
|
|
|
var actor = Sys.ActorOf(Props.Create(() => new ParkedMessageHandlerActor(_service, "site-1")));
|
|
actor.Tell(new RetryParkedOperation("corr-1", id));
|
|
|
|
var ack = ExpectMsg<ParkedOperationActionAck>();
|
|
Assert.True(ack.Applied);
|
|
Assert.Equal("corr-1", ack.CorrelationId);
|
|
Assert.Null(ack.ErrorMessage);
|
|
|
|
// The parked row was reset back to Pending so the retry sweep picks it up.
|
|
var msg = await _storage.GetMessageByIdAsync(id.ToString());
|
|
Assert.NotNull(msg);
|
|
Assert.Equal(StoreAndForwardMessageStatus.Pending, msg!.Status);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task DiscardParkedOperation_ParkedCachedCall_RemovesRowAndApplied()
|
|
{
|
|
var id = TrackedOperationId.New();
|
|
await ParkCachedCallAsync(id);
|
|
|
|
var actor = Sys.ActorOf(Props.Create(() => new ParkedMessageHandlerActor(_service, "site-1")));
|
|
actor.Tell(new DiscardParkedOperation("corr-2", id));
|
|
|
|
var ack = ExpectMsg<ParkedOperationActionAck>();
|
|
Assert.True(ack.Applied);
|
|
Assert.Equal("corr-2", ack.CorrelationId);
|
|
|
|
var msg = await _storage.GetMessageByIdAsync(id.ToString());
|
|
Assert.Null(msg);
|
|
}
|
|
|
|
[Fact]
|
|
public void RetryParkedOperation_UnknownOperation_IsSafeNoOp()
|
|
{
|
|
var actor = Sys.ActorOf(Props.Create(() => new ParkedMessageHandlerActor(_service, "site-1")));
|
|
actor.Tell(new RetryParkedOperation("corr-3", TrackedOperationId.New()));
|
|
|
|
var ack = ExpectMsg<ParkedOperationActionAck>();
|
|
// No parked row matched — definitive "nothing to do", not an error.
|
|
Assert.False(ack.Applied);
|
|
Assert.Equal("corr-3", ack.CorrelationId);
|
|
Assert.Null(ack.ErrorMessage);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task RetryParkedOperation_NonParkedOperation_IsSafeNoOpAndDoesNotCorrupt()
|
|
{
|
|
// Enqueue a cached call but DO NOT park it — it stays Pending.
|
|
var id = TrackedOperationId.New();
|
|
_service.RegisterDeliveryHandler(
|
|
StoreAndForwardCategory.ExternalSystem, _ => throw new HttpRequestException("fails"));
|
|
await _service.EnqueueAsync(
|
|
StoreAndForwardCategory.ExternalSystem, "ERP.GetOrder", """{}""",
|
|
maxRetries: 5, messageId: id.ToString());
|
|
|
|
var before = await _storage.GetMessageByIdAsync(id.ToString());
|
|
Assert.Equal(StoreAndForwardMessageStatus.Pending, before!.Status);
|
|
|
|
var actor = Sys.ActorOf(Props.Create(() => new ParkedMessageHandlerActor(_service, "site-1")));
|
|
actor.Tell(new RetryParkedOperation("corr-4", id));
|
|
|
|
var ack = ExpectMsg<ParkedOperationActionAck>();
|
|
// The row is Pending, not Parked — Retry must be a no-op, not a mutation.
|
|
Assert.False(ack.Applied);
|
|
|
|
var after = await _storage.GetMessageByIdAsync(id.ToString());
|
|
Assert.NotNull(after);
|
|
Assert.Equal(StoreAndForwardMessageStatus.Pending, after!.Status);
|
|
// retry_count untouched — a Parked-only Retry must not reset a live row.
|
|
Assert.Equal(before.RetryCount, after.RetryCount);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task DiscardParkedOperation_NonParkedOperation_IsSafeNoOp()
|
|
{
|
|
var id = TrackedOperationId.New();
|
|
_service.RegisterDeliveryHandler(
|
|
StoreAndForwardCategory.ExternalSystem, _ => throw new HttpRequestException("fails"));
|
|
await _service.EnqueueAsync(
|
|
StoreAndForwardCategory.ExternalSystem, "ERP.GetOrder", """{}""",
|
|
maxRetries: 5, messageId: id.ToString());
|
|
|
|
var actor = Sys.ActorOf(Props.Create(() => new ParkedMessageHandlerActor(_service, "site-1")));
|
|
actor.Tell(new DiscardParkedOperation("corr-5", id));
|
|
|
|
var ack = ExpectMsg<ParkedOperationActionAck>();
|
|
Assert.False(ack.Applied);
|
|
|
|
// The Pending row must NOT have been deleted by a Parked-only Discard.
|
|
var after = await _storage.GetMessageByIdAsync(id.ToString());
|
|
Assert.NotNull(after);
|
|
}
|
|
}
|