Joseph Doherty
037798b367
Tasks 14, 15 and 16, landed as ONE commit. PLAN DEFECT: these three tasks cannot compile separately. SiteReplicationActor takes a ReplicationService and calls ReplaceAllAsync (Task 14 deletes both); DeploymentManagerActor Tells message types declared in ReplicationMessages.cs (Task 15 deletes it); AkkaHostedService constructs the actor (Task 16). Any ordering leaves a broken intermediate. Combining them also strengthens the invariant Task 14 already stated for itself — the two mechanisms never both run, and never neither. Registered 8 tables in SiteLocalDbSetup.OnReady: sf_messages plus the 7 site config tables. notification_lists and smtp_configurations are deliberately NOT registered — permanently empty by design, so registering them would open a standing replication channel whose only historical payload was plaintext SMTP passwords. Migrate stays the LAST call in OnReady, after all registrations, so migrated rows enter the oplog through live capture triggers. Deleted: SiteReplicationActor, ReplicationMessages.cs, ReplicationService, StoreAndForwardStorage.ReplaceAllAsync, and 6 test files. ReplaceAllAsync is not merely unused but unsafe to keep: a mass DELETE on a now-replicated table would be captured and shipped to the peer. Kept ActiveNodeEvaluator (delivery gate + heartbeat still need it) with its doc corrected, and activeNodeCheck in AkkaHostedService (SiteCommunicationActor). The positional-argument hazard the plan flagged was real: removing DeploymentManagerActor's optional IActorRef? replicationActor shifted 6 trailing optionals, and 4 test call sites bound the wrong arguments with no compile error at some positions. Converted them to named arguments where possible — Props.Create builds an expression tree, which rejects out-of-position named args, so the rest are padded positionally with a comment saying why. The Task 7 'not yet registered' test was INVERTED rather than deleted, and is exact in both directions: too few means a table silently stops replicating, too many means the SMTP tables leak. Added a separate security-named test for those two, and a composite-PK test (LWW keys on the full PK, so a truncated key set would collapse distinct rows). The convergence suites now get their registrations from the real OnReady — their temporary harness registration is deleted, so they prove the cutover rather than agreeing with themselves. Verified: build 0 warnings; SiteRuntime 512, StoreAndForward 130, Host 330, AuditLog 355, ExternalSystemGateway 142, HealthMonitoring 97, LocalDb integration 16 — all pass, 0 failures. Claude-Session: https://claude.ai/code/session_01BL2Vu1ESDQ9SCN4gVKkdts
74 lines
3.6 KiB
C#
74 lines
3.6 KiB
C#
using Microsoft.Extensions.DependencyInjection;
|
|
using Microsoft.Extensions.Logging;
|
|
using Microsoft.Extensions.Options;
|
|
using ZB.MOM.WW.LocalDb;
|
|
using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Services;
|
|
using ZB.MOM.WW.ScadaBridge.SiteEventLogging;
|
|
|
|
namespace ZB.MOM.WW.ScadaBridge.StoreAndForward;
|
|
|
|
public static class ServiceCollectionExtensions
|
|
{
|
|
/// <summary>
|
|
/// Registers Store-and-Forward services including storage, the delivery service, and the replication service.
|
|
/// </summary>
|
|
/// <param name="services">The service collection to register into.</param>
|
|
/// <returns>The same <paramref name="services"/> collection, for chaining.</returns>
|
|
public static IServiceCollection AddStoreAndForward(this IServiceCollection services)
|
|
{
|
|
// The buffer now lives in the consolidated LocalDb database at LocalDb:Path, not
|
|
// at StoreAndForwardOptions.SqliteDbPath — that option survives only as the
|
|
// migrator's source location (Task 8).
|
|
services.AddSingleton<StoreAndForwardStorage>(sp => new StoreAndForwardStorage(
|
|
sp.GetRequiredService<ILocalDb>(),
|
|
sp.GetRequiredService<ILogger<StoreAndForwardStorage>>()));
|
|
|
|
services.AddSingleton<StoreAndForwardService>(sp =>
|
|
{
|
|
var storage = sp.GetRequiredService<StoreAndForwardStorage>();
|
|
var options = sp.GetRequiredService<IOptions<StoreAndForwardOptions>>().Value;
|
|
var logger = sp.GetRequiredService<ILogger<StoreAndForwardService>>();
|
|
// Wire the cached-call lifecycle
|
|
// observer + site identity through DI so the S&F retry loop emits
|
|
// per-attempt + terminal telemetry under the same TrackedOperationId
|
|
// the script-thread CachedSubmit row used. Both bindings are
|
|
// optional — when null the legacy retry behaviour is
|
|
// preserved exactly (tests, central nodes without sites, hosts
|
|
// that haven't called AddAuditLog).
|
|
//
|
|
// Site identity is resolved through the optional
|
|
// IStoreAndForwardSiteContext binding (registered by the Host) to
|
|
// avoid a project-reference cycle with HealthMonitoring's
|
|
// ISiteIdentityProvider — HealthMonitoring already references S&F.
|
|
var cachedCallObserver = sp.GetService<ICachedCallLifecycleObserver>();
|
|
var siteContext = sp.GetService<IStoreAndForwardSiteContext>();
|
|
var siteId = siteContext?.SiteId ?? string.Empty;
|
|
// Optional site operational-event log. Resolved through
|
|
// GetService so a host (or test) that has not called
|
|
// AddSiteEventLogging simply gets null and the S&F activity stays
|
|
// a no-op for site-event purposes.
|
|
var siteEventLogger = sp.GetService<ISiteEventLogger>();
|
|
return new StoreAndForwardService(
|
|
storage,
|
|
options,
|
|
logger,
|
|
cachedCallObserver,
|
|
siteId,
|
|
siteEventLogger);
|
|
});
|
|
|
|
return services;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Registers Store-and-Forward Akka actor bindings. Actor creation is handled by the Host during actor system startup.
|
|
/// </summary>
|
|
/// <param name="services">The service collection to register into.</param>
|
|
/// <returns>The same <paramref name="services"/> collection, for chaining.</returns>
|
|
public static IServiceCollection AddStoreAndForwardActors(this IServiceCollection services)
|
|
{
|
|
// Akka actor registration handled by Host component during actor system startup
|
|
return services;
|
|
}
|
|
}
|