Joseph Doherty
d6fac2d81d
Builds TwoNodeClusterHarness: two in-process Host-equivalent nodes sharing
an in-memory ConfigDb. Forms a 2-member Akka cluster. ClusterFormationTests
proves both nodes see each other as admin+driver role members.
Fixes a real production bug uncovered while wiring the harness — Program.cs
ran two separate ActorSystems (one from AddOtOpcUaCluster.AkkaHostedService
with cluster HOCON, one from Akka.Hosting.AddAkka with bare HOCON). Cluster
singletons landed on the bare ActorSystem and could not actually form a
cluster ("Configuration does not contain `akka.cluster` node").
Consolidation:
- AddOtOpcUaCluster now only binds AkkaClusterOptions + registers IClusterRoleInfo
- New WithOtOpcUaClusterBootstrap pushes embedded HOCON + Remote/Cluster options
into Akka.Hosting's AkkaConfigurationBuilder
- AkkaHostedService.cs deleted — Akka.Hosting now owns the lifecycle
- Program.cs + harness call WithOtOpcUaClusterBootstrap inside AddAkka
Why not WebApplicationFactory<Program>? Program.cs reads OTOPCUA_ROLES from
process env (shared across in-process WAFs); the harness replays Program.cs's
DI graph from a clean WebApplicationBuilder per node with per-node config
overrides. Same production extensions, isolated config + Kestrel + Akka ports.
Tests: 93 v2 tests pass (was 91 + 2 new cluster formation), 0 skipped.
68 lines
2.4 KiB
C#
68 lines
2.4 KiB
C#
using Akka.Cluster.Hosting;
|
|
using Akka.Hosting;
|
|
using Akka.Remote.Hosting;
|
|
using Microsoft.Extensions.Configuration;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using Microsoft.Extensions.Options;
|
|
using ZB.MOM.WW.OtOpcUa.Commons.Interfaces;
|
|
|
|
namespace ZB.MOM.WW.OtOpcUa.Cluster;
|
|
|
|
public static class ServiceCollectionExtensions
|
|
{
|
|
/// <summary>
|
|
/// Binds <see cref="AkkaClusterOptions"/> and registers <see cref="IClusterRoleInfo"/>. The
|
|
/// actual ActorSystem + cluster bootstrap is layered on inside the host's <c>AddAkka(...)</c>
|
|
/// configurator via <see cref="WithOtOpcUaClusterBootstrap"/> — keeping the entire Akka graph
|
|
/// under Akka.Hosting's management so cluster singletons land on the same ActorSystem.
|
|
/// </summary>
|
|
public static IServiceCollection AddOtOpcUaCluster(this IServiceCollection services, IConfiguration configuration)
|
|
{
|
|
services.AddOptions<AkkaClusterOptions>()
|
|
.Bind(configuration.GetSection(AkkaClusterOptions.SectionName));
|
|
|
|
services.AddSingleton<IClusterRoleInfo, ClusterRoleInfo>();
|
|
|
|
return services;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Configures the Akka.Hosting builder with the embedded OtOpcUa HOCON (split-brain resolver,
|
|
/// pinned dispatcher, failure detector tuning) + remote endpoint + cluster bootstrap derived
|
|
/// from <see cref="AkkaClusterOptions"/>.
|
|
///
|
|
/// Wire from Program.cs:
|
|
/// <code>
|
|
/// services.AddAkka("otopcua", (ab, sp) =>
|
|
/// {
|
|
/// ab.WithOtOpcUaClusterBootstrap(sp);
|
|
/// if (hasAdmin) ab.WithOtOpcUaControlPlaneSingletons();
|
|
/// if (hasDriver) ab.WithOtOpcUaRuntimeActors();
|
|
/// });
|
|
/// </code>
|
|
/// </summary>
|
|
public static AkkaConfigurationBuilder WithOtOpcUaClusterBootstrap(
|
|
this AkkaConfigurationBuilder builder,
|
|
IServiceProvider serviceProvider)
|
|
{
|
|
var options = serviceProvider.GetRequiredService<IOptions<AkkaClusterOptions>>().Value;
|
|
|
|
builder.AddHocon(HoconLoader.LoadBaseConfig(), HoconAddMode.Append);
|
|
|
|
builder.WithRemoting(new RemoteOptions
|
|
{
|
|
HostName = options.Hostname,
|
|
Port = options.Port,
|
|
PublicHostName = options.PublicHostname,
|
|
});
|
|
|
|
builder.WithClustering(new ClusterOptions
|
|
{
|
|
SeedNodes = options.SeedNodes,
|
|
Roles = options.Roles,
|
|
});
|
|
|
|
return builder;
|
|
}
|
|
}
|