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
99 lines
5.5 KiB
C#
99 lines
5.5 KiB
C#
using Microsoft.Extensions.DependencyInjection;
|
|
using Microsoft.Extensions.Logging;
|
|
using Microsoft.Extensions.Options;
|
|
using ZB.MOM.WW.LocalDb;
|
|
using ZB.MOM.WW.ScadaBridge.Communication.Grpc;
|
|
using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Repositories;
|
|
using ZB.MOM.WW.ScadaBridge.SiteRuntime.Deployment;
|
|
using ZB.MOM.WW.ScadaBridge.SiteRuntime.Persistence;
|
|
using ZB.MOM.WW.ScadaBridge.SiteRuntime.Repositories;
|
|
using ZB.MOM.WW.ScadaBridge.SiteRuntime.Scripts;
|
|
using ZB.MOM.WW.ScadaBridge.SiteRuntime.Streaming;
|
|
|
|
namespace ZB.MOM.WW.ScadaBridge.SiteRuntime;
|
|
|
|
public static class ServiceCollectionExtensions
|
|
{
|
|
/// <summary>
|
|
/// Registers Site Runtime services including SiteStorageService, which persists to the
|
|
/// consolidated site database resolved from <c>ILocalDb</c> (<c>LocalDb:Path</c>).
|
|
/// </summary>
|
|
/// <param name="services">The DI service collection to register services into.</param>
|
|
/// <returns>The same <see cref="IServiceCollection"/> to allow chaining.</returns>
|
|
public static IServiceCollection AddSiteRuntime(this IServiceCollection services)
|
|
{
|
|
// SiteStorageService takes ILocalDb (the consolidated site database at
|
|
// LocalDb:Path) rather than a connection string, so there is nothing left for a
|
|
// caller to supply — the string overload is gone and this is the only entry point.
|
|
services.AddSingleton(sp => new SiteStorageService(
|
|
sp.GetRequiredService<ILocalDb>(),
|
|
sp.GetRequiredService<ILogger<SiteStorageService>>()));
|
|
|
|
services.AddHostedService<SiteStorageInitializer>();
|
|
|
|
// Script compilation service
|
|
services.AddSingleton<ScriptCompilationService>();
|
|
|
|
// Shared script library
|
|
services.AddSingleton<SharedScriptLibrary>();
|
|
|
|
// Site stream manager — registered as singleton and exposed as ISiteStreamSubscriber
|
|
// so the gRPC server can subscribe relay actors to instance events.
|
|
// ActorSystem is injected later via Initialize() after AkkaHostedService starts.
|
|
services.AddSingleton(sp =>
|
|
{
|
|
var options = sp.GetRequiredService<IOptions<SiteRuntimeOptions>>().Value;
|
|
var logger = sp.GetRequiredService<ILogger<SiteStreamManager>>();
|
|
return new SiteStreamManager(options, logger);
|
|
});
|
|
services.AddSingleton<ISiteStreamSubscriber>(sp => sp.GetRequiredService<SiteStreamManager>());
|
|
|
|
// Site-local cached-operation tracking store — the SQLite source of truth
|
|
// that Tracking.Status(TrackedOperationId) reads and the cached-call telemetry
|
|
// forwarder writes. Registered HERE (site-only) so the two comments that claim
|
|
// "the operational tracking store is registered by AddSiteRuntime" are true
|
|
// again (AuditLog SCE + AkkaHostedService). Before this (arch-review 08 round 2
|
|
// NF4/T8) it had no DI registration anywhere in src/, so every consumer resolved
|
|
// it as null and silently ran degraded (no cached-drain, no PullSiteCalls
|
|
// reconciliation, Tracking.Status audit-only). Central roots never call
|
|
// AddSiteRuntime, so this stays absent on central — matching the SITE-ONLY
|
|
// contract. OperationTrackingOptions is bound + validated by the Host's
|
|
// SiteServiceRegistration site-options block — but it no longer supplies the
|
|
// store's database: the store takes ILocalDb (the consolidated site database
|
|
// at LocalDb:Path), so OperationTrackingOptions.ConnectionString is now only
|
|
// read by the site config DB. Resolving this store therefore forces ILocalDb
|
|
// construction, which is what runs SiteLocalDbSetup.OnReady.
|
|
services.AddSingleton<Commons.Interfaces.IOperationTrackingStore, Tracking.OperationTrackingStore>();
|
|
|
|
// Site-local repository implementations backed by SQLite
|
|
services.AddScoped<IExternalSystemRepository, SiteExternalSystemRepository>();
|
|
|
|
// Notify-and-fetch: typed HttpClient for fetching deployment configs from central.
|
|
services.AddHttpClient<IDeploymentConfigFetcher, HttpDeploymentConfigFetcher>()
|
|
.ConfigureHttpClient((sp, c) =>
|
|
c.Timeout = TimeSpan.FromSeconds(
|
|
sp.GetRequiredService<IOptions<SiteRuntimeOptions>>().Value.ConfigFetchTimeoutSeconds));
|
|
|
|
// S2/UA5: periodically lift the shared script-execution scheduler gauges
|
|
// (queue depth, busy threads, oldest-busy age) onto the site health report.
|
|
// Registered via factory-lambda so ISiteHealthCollector (registered by the
|
|
// Host's AddSiteHealthMonitoring) is resolved lazily at host start.
|
|
services.AddHostedService(sp => new ScriptSchedulerStatsReporter(
|
|
sp.GetRequiredService<HealthMonitoring.ISiteHealthCollector>(),
|
|
sp.GetRequiredService<IOptions<SiteRuntimeOptions>>().Value,
|
|
sp.GetRequiredService<ILogger<ScriptSchedulerStatsReporter>>()));
|
|
|
|
return services;
|
|
}
|
|
|
|
/// <summary>Registers any additional DI services needed by the Site Runtime Akka actors.</summary>
|
|
/// <param name="services">The DI service collection to register services into.</param>
|
|
/// <returns>The same <see cref="IServiceCollection"/> to allow chaining.</returns>
|
|
public static IServiceCollection AddSiteRuntimeActors(this IServiceCollection services)
|
|
{
|
|
// Actor registration is handled by AkkaHostedService.RegisterSiteActors()
|
|
// which creates the DeploymentManager singleton and proxy
|
|
return services;
|
|
}
|
|
}
|