Joseph Doherty
a212283104
WP2.6 (arch-review remediation, cross-cutting misc): - SiteExternalSystemRepository: name/ID-indexed ExternalSystemDefinitionCache replaces the fetch-all + reverse-map scan on every by-ID/method lookup; loaded once per redeploy, invalidated by DeploymentManagerActor after HandleDeployArtifacts applies external-system changes. Static JsonSerializerOptions for method-list parsing. - Inbound API: short-TTL ApiMethodCache fronts the per-request ApiMethod repository fetch; invalidated by name via the existing ScriptArtifactChangeSubscriber/ IScriptArtifactChangeBus pipeline, self-healing via TTL for changes the bus doesn't cover (e.g. Management API edits). - StoreAndForward: the cached-call audit-observer queue — the one unbounded channel left in the system — is now bounded (ObserverQueueCapacity, default 10,000) with DropOldest overflow and a dropped-notification counter. - SiteStreamManager: alarm state changes now travel a dedicated publish source/broadcast hub, isolated from the (far higher-volume) attribute path, so an attribute storm can no longer evict a pending alarm transition; the alarm hand-off queue is bounded with a drop counter surfaced on the site health report (SiteStreamAlarmDropCount via the new SiteStreamAlarmDropReporter), and publishing is skipped entirely at zero subscribers on either path. - CLI ManagementHttpClient: explicit 30s HttpClient.Timeout on the shared construction (was the 100s framework default), overridable via SCADABRIDGE_HTTP_TIMEOUT_SECONDS. Deviation: the failback-probe heartbeat item is NOT included — its only viable surface (CentralChannelProvider.cs / heartbeat consumers) lives entirely in the Communication project, explicitly off-limits to this work package this phase. Tests: SiteRuntime.Tests (550), InboundAPI.Tests (278), StoreAndForward.Tests (133), CLI.Tests (390), HealthMonitoring.Tests (97) — all green after full solution build.
50 lines
2.7 KiB
C#
50 lines
2.7 KiB
C#
using ZB.MOM.WW.Configuration;
|
|
|
|
namespace ZB.MOM.WW.ScadaBridge.StoreAndForward;
|
|
|
|
/// <summary>
|
|
/// Validates <see cref="StoreAndForwardOptions"/> at startup. The retry intervals
|
|
/// feed the background sweep timer (a zero/negative period trips
|
|
/// <see cref="ArgumentOutOfRangeException"/> in the timer constructor). Registered
|
|
/// with <c>ValidateOnStart()</c> so a bad <c>ScadaBridge:StoreAndForward</c> section
|
|
/// fails fast at boot with a clear, key-naming message.
|
|
/// <para>
|
|
/// <see cref="StoreAndForwardOptions.SqliteDbPath"/> is deliberately NOT validated.
|
|
/// Before LocalDb Phase 2 it was the live buffer file, so an empty value produced an
|
|
/// opaque connection failure at first enqueue; the buffer now lives in the
|
|
/// consolidated LocalDb database and the key survives only as the legacy migration
|
|
/// source. An empty value there is a legitimate "nothing to migrate", so requiring
|
|
/// it would make every already-migrated node carry a dead key forever.
|
|
/// </para>
|
|
/// </summary>
|
|
public sealed class StoreAndForwardOptionsValidator : OptionsValidatorBase<StoreAndForwardOptions>
|
|
{
|
|
/// <inheritdoc />
|
|
protected override void Validate(ValidationBuilder builder, StoreAndForwardOptions options)
|
|
{
|
|
builder.RequireThat(options.DefaultRetryInterval > TimeSpan.Zero,
|
|
$"ScadaBridge:StoreAndForward:DefaultRetryInterval must be a positive duration " +
|
|
$"(was {options.DefaultRetryInterval}); it is the default per-message retry interval.");
|
|
|
|
builder.RequireThat(options.RetryTimerInterval > TimeSpan.Zero,
|
|
$"ScadaBridge:StoreAndForward:RetryTimerInterval must be a positive duration " +
|
|
$"(was {options.RetryTimerInterval}); it is the background retry-sweep timer period.");
|
|
|
|
builder.RequireThat(options.DefaultMaxRetries >= 0,
|
|
$"ScadaBridge:StoreAndForward:DefaultMaxRetries must be >= 0 " +
|
|
$"(was {options.DefaultMaxRetries}).");
|
|
|
|
builder.RequireThat(options.SweepBatchLimit >= 0,
|
|
$"ScadaBridge:StoreAndForward:SweepBatchLimit must be >= 0 " +
|
|
$"(was {options.SweepBatchLimit}); it bounds due rows per retry sweep — 0 means unlimited (legacy).");
|
|
|
|
builder.RequireThat(options.SweepTargetParallelism >= 1,
|
|
$"ScadaBridge:StoreAndForward:SweepTargetParallelism must be >= 1 " +
|
|
$"(was {options.SweepTargetParallelism}); it caps concurrent (category,target) sweep lanes — 1 means serial.");
|
|
|
|
builder.RequireThat(options.ObserverQueueCapacity >= 1,
|
|
$"ScadaBridge:StoreAndForward:ObserverQueueCapacity must be >= 1 " +
|
|
$"(was {options.ObserverQueueCapacity}); it bounds the cached-call audit-observer pump's queue.");
|
|
}
|
|
}
|