da141497f8
DriverHostActor.ApplyAndAck now reads the deployment artifact and reconciles its set of DriverInstanceActor children — spawn the missing, ApplyDelta to those with changed config, stop the removed/disabled. The diff lives in pure DriverSpawnPlanner so it can be unit-tested without an ActorSystem. Adds IDriverFactory in Core.Abstractions (consumed by Runtime) + DriverFactoryRegistryAdapter in Core.Hosting that wraps the existing v1 DriverFactoryRegistry — Runtime stays decoupled from Polly/Serilog, the Host wires the adapter once driver assemblies have registered. ShouldStub(type, roles) is now actually called on every spawn — Galaxy + Wonderware-Historian boot stubbed on macOS/Linux or whenever the host carries the dev role. Missing factory ⇒ stub fallback, never a crash. Tests: 24 → 34 in Runtime (+10): - DriverSpawnPlannerTests x7 (diff cases, type change ⇒ stop+respawn) - DeploymentArtifactTests x5 (empty/malformed/missing fields tolerant) - DriverHostActorReconcileTests x4 (spawn count, stub fallback, ShouldStub gate, second-apply stops the removed) All 6 v2 test suites green: 120 tests passing. Closes F20 (ShouldStub wired). F7 marked partial — subscription publishing + write path still stubbed in DriverInstanceActor itself.
88 lines
4.0 KiB
C#
88 lines
4.0 KiB
C#
using Akka.Actor;
|
|
using Akka.Hosting;
|
|
using Microsoft.EntityFrameworkCore;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using Microsoft.Extensions.DependencyInjection.Extensions;
|
|
using ZB.MOM.WW.OtOpcUa.Commons.Interfaces;
|
|
using ZB.MOM.WW.OtOpcUa.Configuration;
|
|
using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
|
|
using ZB.MOM.WW.OtOpcUa.Core.AlarmHistorian;
|
|
using ZB.MOM.WW.OtOpcUa.Runtime.Drivers;
|
|
using ZB.MOM.WW.OtOpcUa.Runtime.Health;
|
|
using ZB.MOM.WW.OtOpcUa.Runtime.Historian;
|
|
|
|
namespace ZB.MOM.WW.OtOpcUa.Runtime;
|
|
|
|
public static class ServiceCollectionExtensions
|
|
{
|
|
public const string DriverRole = "driver";
|
|
|
|
public const string DriverHostActorName = "driver-host";
|
|
public const string DbHealthProbeActorName = "db-health";
|
|
public const string HistorianAdapterActorName = "historian-adapter";
|
|
|
|
/// <summary>
|
|
/// Registers shared runtime services. Currently binds <see cref="IAlarmHistorianSink"/>
|
|
/// to <see cref="NullAlarmHistorianSink"/> as the default; production deployments
|
|
/// override this with <c>SqliteStoreAndForwardSink</c> wrapping <c>WonderwareHistorianClient</c>.
|
|
/// Call this BEFORE <c>AddAkka</c>.
|
|
/// </summary>
|
|
public static IServiceCollection AddOtOpcUaRuntime(this IServiceCollection services)
|
|
{
|
|
services.TryAddSingleton<IAlarmHistorianSink>(NullAlarmHistorianSink.Instance);
|
|
services.TryAddSingleton<IDriverFactory>(NullDriverFactory.Instance);
|
|
return services;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Spawns the per-node driver-role actors on the host's <see cref="ActorSystem"/>:
|
|
/// <see cref="DriverHostActor"/> (one per node), <see cref="DbHealthProbeActor"/>
|
|
/// (consumed by the health endpoint + redundancy calc), and
|
|
/// <see cref="HistorianAdapterActor"/> wrapping the registered <see cref="IAlarmHistorianSink"/>.
|
|
///
|
|
/// Mirror of <c>WithOtOpcUaControlPlaneSingletons</c> for the driver role. Both must
|
|
/// be registered on the same <see cref="AkkaConfigurationBuilder"/> as the cluster
|
|
/// bootstrap so the actors share the host's ActorSystem.
|
|
///
|
|
/// Wire from the fused Host's Program.cs when the node carries the <c>driver</c> role:
|
|
/// <code>
|
|
/// services.AddOtOpcUaRuntime();
|
|
/// services.AddAkka("otopcua", (ab, sp) => { ab.WithOtOpcUaClusterBootstrap(sp); if (hasDriver) ab.WithOtOpcUaRuntimeActors(); });
|
|
/// </code>
|
|
/// </summary>
|
|
public static AkkaConfigurationBuilder WithOtOpcUaRuntimeActors(this AkkaConfigurationBuilder builder)
|
|
{
|
|
builder.WithActors((system, registry, resolver) =>
|
|
{
|
|
var dbFactory = resolver.GetService<IDbContextFactory<OtOpcUaConfigDbContext>>();
|
|
var roleInfo = resolver.GetService<IClusterRoleInfo>();
|
|
// Fallback to Null* if AddOtOpcUaRuntime wasn't called (e.g., test harnesses).
|
|
var historianSink = resolver.GetService<IAlarmHistorianSink>() ?? NullAlarmHistorianSink.Instance;
|
|
var driverFactory = resolver.GetService<IDriverFactory>() ?? NullDriverFactory.Instance;
|
|
|
|
var dbHealth = system.ActorOf(
|
|
DbHealthProbeActor.Props(dbFactory),
|
|
DbHealthProbeActorName);
|
|
registry.Register<DbHealthProbeActorKey>(dbHealth);
|
|
|
|
var driverHost = system.ActorOf(
|
|
DriverHostActor.Props(dbFactory, roleInfo.LocalNode, coordinator: null,
|
|
driverFactory: driverFactory, localRoles: roleInfo.LocalRoles),
|
|
DriverHostActorName);
|
|
registry.Register<DriverHostActorKey>(driverHost);
|
|
|
|
var historian = system.ActorOf(
|
|
HistorianAdapterActor.Props(historianSink),
|
|
HistorianAdapterActorName);
|
|
registry.Register<HistorianAdapterActorKey>(historian);
|
|
});
|
|
|
|
return builder;
|
|
}
|
|
}
|
|
|
|
/// <summary>Marker key types used by <c>Akka.Hosting</c> to resolve runtime actors from the registry.</summary>
|
|
public sealed class DriverHostActorKey { }
|
|
public sealed class DbHealthProbeActorKey { }
|
|
public sealed class HistorianAdapterActorKey { }
|