Joseph Doherty
605e56829e
LocalDb Phase 2 deleted the bespoke replicators, so three config keys changed meaning or died outright: - ScadaBridge:StoreAndForward:ReplicationEnabled is fully dead. Deleted the property, its 10 config entries, and the 5 test references. - SqliteDbPath / SiteDbPath are now migration-only: they name the legacy files SiteLocalDbLegacyMigrator drains at boot, not live databases. Both mandatory rules are relaxed accordingly (StartupValidator's Site-only Require, and the S&F validator's non-empty rule) — an absent value now means "nothing to migrate", so an already-migrated node can drop the key. DatabaseOptions- Validator still rejects a present-but-blank value. - SiteRuntime:ConfigFetchRetryCount's only reader was SiteReplicationActor. Deleted with its validator rule. The two path keys stay present in every config, now with a comment explaining why: removing them would strand un-migrated data on a node that has not yet started once. Both relaxations are pinned by the inverse of the test they replace (Site_MissingSiteDbPath_IsAccepted..., EmptySqliteDbPath_IsAccepted...), each verified to fail with the old rule restored. Note: deploy/wonder-app-vd03/appsettings.Site.json is under a gitignored deploy/ tree, so its edit is local-only and must be repeated on the box. Claude-Session: https://claude.ai/code/session_01BL2Vu1ESDQ9SCN4gVKkdts
46 lines
2.4 KiB
C#
46 lines
2.4 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.");
|
|
}
|
|
}
|