7c1268d85c
`DataConnectionManagerActor.HandleCreateConnection` is create-only (warns and
returns for a name it already holds), so `EnsureDclConnection`'s documented
"a changed config re-issues the create so the DCL adopts it" was never true on
ANY node: a corrected endpoint/credential/backup/failover-count took effect only
when the connection was next built from scratch (node restart, singleton
failover, remove-then-re-add), while the DM's hash cache recorded it as applied.
Rows 89/90 made that honest with a Warning; this closes it.
New `ReconfigureConnectionCommand` (Commons, same shape as the create):
- `DeploymentManagerActor.EnsureDclConnection` now has three outcomes off its one
per-name hash slot — unchanged -> nothing at all, new -> create, CHANGED ->
reconfigure — and logs "Reconfigured DCL connection {Connection}
(protocol={Protocol}) in place" at Information in place of the old Warning. The
winner-resolution / arbitration / tombstone logic is untouched; only what
happens after a change is detected changed.
- `DataConnectionManagerActor` FORWARDS the command to the owning connection
actor, falling back to a create for a name it does not hold, so the command is
safe whatever the manager's state.
- `DataConnectionActor` handles it in ALL THREE states and never stashes it — a
connection pointed at a wrong or dead endpoint lives in Connecting/Reconnecting,
which is exactly when a correction arrives; stashed it would wait on the broken
configuration forever. Handling replaces protocol/primary/backup/failover-count,
re-arms endpoint selection to Primary (the new config's primary is the intent,
whatever the old config had failed over to), and calls the new shared
`SwapAdapter` helper — now used by both failover sites too, so the swap exists
once: unhook + fire-and-forget dispose -> _factory.Create -> rewire -> bump
_adapterGeneration LAST. `BecomeReconnecting(afterReconfigure: true)` then
reconnects immediately (StartSingleTimer replaces any armed reconnect, so no
racing attempts) with the unstable-disconnect accounting and failover check
suppressed — the link was dropped on purpose, and counting it as an unstable
cycle could trip a failover onto the NEW backup before the new primary had been
tried once. ReSubscribeAll/ReSubscribeAllAlarms then re-issue everything from
the untouched subscription registries. Idempotent: a reconfigure carrying the
configuration already in force is a no-op.
Stop-and-recreate was rejected as destructive: subscriptions live inside
DataConnectionActor and InstanceActor cancels its subscribe-retry timer on first
success, so a rebuilt actor would have no subscribers and nothing would ever
re-subscribe.
Tests: new DataConnectionReconfigureTests (7; 5 fail / 2 pass against a
behavioural revert). DclConnectionArbitrationTests gains two row-97 tests and its
CDC-arrival test now asserts the second push is a reconfigure; its ping-pong
guard also asserts zero reconfigures, since a flip would now show up there.
SiteRuntime-010 renamed to ..._ReissuesReconfigureCommand. 3 fail against a
reverted EnsureDclConnection. DataConnectionLayer.Tests 327/327,
SiteRuntime.Tests 643/643, solution build 0 warnings.
Docs: Component-DataConnectionLayer.md gains an "In-place reconfiguration"
section under Endpoint Redundancy; Component-SiteRuntime.md, and the
docs/components/ mirrors, updated; the arbitration decision memo gains an
appended §9 postscript resolving its residual 1 (residuals 2 and 3 stay open).
386 lines
17 KiB
C#
386 lines
17 KiB
C#
using Akka.Actor;
|
|
using Akka.Event;
|
|
using Microsoft.Extensions.Logging.Abstractions;
|
|
using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Protocol;
|
|
using ZB.MOM.WW.ScadaBridge.Commons.Messages.DataConnection;
|
|
using ZB.MOM.WW.ScadaBridge.Commons.Messages.Management;
|
|
using ZB.MOM.WW.ScadaBridge.Commons.Observability;
|
|
using ZB.MOM.WW.ScadaBridge.Commons.Serialization;
|
|
using ZB.MOM.WW.ScadaBridge.Commons.Types.DataConnections;
|
|
using ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Adapters;
|
|
using ZB.MOM.WW.ScadaBridge.HealthMonitoring;
|
|
using ZB.MOM.WW.ScadaBridge.SiteEventLogging;
|
|
|
|
namespace ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Actors;
|
|
|
|
/// <summary>
|
|
/// Protocol extensibility — manages DataConnectionActor instances.
|
|
/// Routes messages to the correct connection actor based on connection name.
|
|
/// Adding a new protocol = implement IDataConnection + register with IDataConnectionFactory.
|
|
/// </summary>
|
|
public class DataConnectionManagerActor : ReceiveActor
|
|
{
|
|
private readonly ILoggingAdapter _log = Context.GetLogger();
|
|
private readonly IDataConnectionFactory _factory;
|
|
private readonly DataConnectionOptions _options;
|
|
private readonly ISiteHealthCollector _healthCollector;
|
|
private readonly ISiteEventLogger? _siteEventLogger;
|
|
// Deployment-wide OPC UA application identity / cert-store paths — the same
|
|
// global options the DataConnectionFactory feeds to RealOpcUaClient when creating OPC
|
|
// UA connections. Needed by the verify-endpoint probe (VerifyEndpointCommand), which
|
|
// builds an ApplicationConfiguration directly rather than through a connection actor.
|
|
private readonly OpcUaGlobalOptions _opcUaGlobalOptions;
|
|
private readonly Dictionary<string, IActorRef> _connectionActors = new();
|
|
|
|
/// <summary>
|
|
/// Initializes a new <see cref="DataConnectionManagerActor"/> with the required dependencies.
|
|
/// </summary>
|
|
/// <param name="factory">Factory used to create protocol-specific data connection adapters.</param>
|
|
/// <param name="options">Configuration options for data connections.</param>
|
|
/// <param name="healthCollector">Collector for site health metrics reported by connection actors.</param>
|
|
/// <param name="siteEventLogger">Optional logger for site event entries; null disables site event logging.</param>
|
|
/// <param name="opcUaGlobalOptions">
|
|
/// Deployment-wide OPC UA application identity / cert-store paths used by the
|
|
/// verify-endpoint probe; null falls back to defaults (mirrors
|
|
/// <see cref="DataConnectionFactory"/>'s default-options constructor).
|
|
/// </param>
|
|
public DataConnectionManagerActor(
|
|
IDataConnectionFactory factory,
|
|
DataConnectionOptions options,
|
|
ISiteHealthCollector healthCollector,
|
|
ISiteEventLogger? siteEventLogger = null,
|
|
OpcUaGlobalOptions? opcUaGlobalOptions = null)
|
|
{
|
|
_factory = factory;
|
|
_options = options;
|
|
_healthCollector = healthCollector;
|
|
_siteEventLogger = siteEventLogger;
|
|
_opcUaGlobalOptions = opcUaGlobalOptions ?? new OpcUaGlobalOptions();
|
|
|
|
Receive<CreateConnectionCommand>(HandleCreateConnection);
|
|
Receive<ReconfigureConnectionCommand>(HandleReconfigureConnection);
|
|
Receive<SubscribeTagsRequest>(HandleRoute);
|
|
Receive<UnsubscribeTagsRequest>(HandleRoute);
|
|
Receive<SubscribeAlarmsRequest>(HandleRouteAlarms);
|
|
Receive<UnsubscribeAlarmsRequest>(HandleRouteAlarms);
|
|
Receive<WriteTagRequest>(HandleRouteWrite);
|
|
Receive<WriteTagBatchRequest>(HandleRouteWriteBatch);
|
|
Receive<RemoveConnectionCommand>(HandleRemoveConnection);
|
|
Receive<GetAllHealthReports>(HandleGetAllHealthReports);
|
|
Receive<BrowseNodeCommand>(HandleBrowse);
|
|
Receive<SearchAddressSpaceCommand>(HandleSearch);
|
|
Receive<ReadTagValuesCommand>(HandleReadTagValues);
|
|
Receive<VerifyEndpointCommand>(HandleVerifyEndpoint);
|
|
}
|
|
|
|
private void HandleCreateConnection(CreateConnectionCommand command)
|
|
{
|
|
if (_connectionActors.ContainsKey(command.ConnectionName))
|
|
{
|
|
_log.Warning("Connection {0} already exists", command.ConnectionName);
|
|
return;
|
|
}
|
|
|
|
// Factory creates the correct adapter based on protocol type
|
|
var adapter = _factory.Create(command.ProtocolType, command.PrimaryConnectionDetails);
|
|
|
|
var props = Props.Create(() => new DataConnectionActor(
|
|
command.ConnectionName, adapter, _options, _healthCollector,
|
|
_factory, command.ProtocolType,
|
|
command.PrimaryConnectionDetails,
|
|
command.BackupConnectionDetails,
|
|
command.FailoverRetryCount,
|
|
_siteEventLogger));
|
|
|
|
// Sanitize name for Akka actor path (replace spaces and invalid chars)
|
|
var actorName = new string(command.ConnectionName
|
|
.Select(c => char.IsLetterOrDigit(c) || "-_.*$+:@&=,!~';()".Contains(c) ? c : '-')
|
|
.ToArray());
|
|
var actorRef = Context.ActorOf(props, actorName);
|
|
_connectionActors[command.ConnectionName] = actorRef;
|
|
|
|
_log.Info("Created DataConnectionActor for {0} (protocol={1})",
|
|
command.ConnectionName, command.ProtocolType);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Applies a new configuration to a LIVE connection actor (deferred register row 97) by
|
|
/// forwarding the command to it — the actor swaps its adapter in place and re-issues every
|
|
/// subscription it holds, rather than being stopped and rebuilt (which would silently strand
|
|
/// every subscriber; see <see cref="ReconfigureConnectionCommand"/>).
|
|
///
|
|
/// <para>
|
|
/// A name this manager does not hold falls back to <see cref="HandleCreateConnection"/>, so
|
|
/// the command is safe regardless of manager state: a sender whose view of which connections
|
|
/// exist is stale (a fresh singleton incarnation, a node that has just taken over) still
|
|
/// converges on the intended configuration in one message.
|
|
/// </para>
|
|
/// </summary>
|
|
private void HandleReconfigureConnection(ReconfigureConnectionCommand command)
|
|
{
|
|
if (_connectionActors.TryGetValue(command.ConnectionName, out var actor))
|
|
{
|
|
_log.Info("Reconfiguring DataConnectionActor for {0} in place (protocol={1})",
|
|
command.ConnectionName, command.ProtocolType);
|
|
actor.Forward(command);
|
|
return;
|
|
}
|
|
|
|
_log.Info(
|
|
"Reconfigure for {0} arrived with no live connection actor — creating it instead",
|
|
command.ConnectionName);
|
|
HandleCreateConnection(new CreateConnectionCommand(
|
|
command.ConnectionName,
|
|
command.ProtocolType,
|
|
command.PrimaryConnectionDetails,
|
|
command.BackupConnectionDetails,
|
|
command.FailoverRetryCount));
|
|
}
|
|
|
|
private void HandleRoute(SubscribeTagsRequest request)
|
|
{
|
|
if (_connectionActors.TryGetValue(request.ConnectionName, out var actor))
|
|
actor.Forward(request);
|
|
else
|
|
{
|
|
_log.Warning("No connection actor for {0}", request.ConnectionName);
|
|
Sender.Tell(new SubscribeTagsResponse(
|
|
request.CorrelationId, request.InstanceUniqueName, false,
|
|
$"Unknown connection: {request.ConnectionName}", DateTimeOffset.UtcNow));
|
|
}
|
|
}
|
|
|
|
private void HandleRoute(UnsubscribeTagsRequest request)
|
|
{
|
|
if (_connectionActors.TryGetValue(request.ConnectionName, out var actor))
|
|
actor.Forward(request);
|
|
else
|
|
_log.Warning("No connection actor for {0} during unsubscribe", request.ConnectionName);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Routes a native alarm subscribe to the <see cref="DataConnectionActor"/> that owns
|
|
/// the named connection (the NativeAlarmActor sends here, not to the child directly).
|
|
/// </summary>
|
|
private void HandleRouteAlarms(SubscribeAlarmsRequest request)
|
|
{
|
|
if (_connectionActors.TryGetValue(request.ConnectionName, out var actor))
|
|
actor.Forward(request);
|
|
else
|
|
{
|
|
_log.Warning("No connection actor for {0} during alarm subscribe", request.ConnectionName);
|
|
Sender.Tell(new SubscribeAlarmsResponse(
|
|
request.CorrelationId, request.InstanceUniqueName, false,
|
|
$"Unknown connection: {request.ConnectionName}", DateTimeOffset.UtcNow));
|
|
}
|
|
}
|
|
|
|
private void HandleRouteAlarms(UnsubscribeAlarmsRequest request)
|
|
{
|
|
if (_connectionActors.TryGetValue(request.ConnectionName, out var actor))
|
|
actor.Forward(request);
|
|
else
|
|
_log.Warning("No connection actor for {0} during alarm unsubscribe", request.ConnectionName);
|
|
}
|
|
|
|
private void HandleRouteWrite(WriteTagRequest request)
|
|
{
|
|
if (_connectionActors.TryGetValue(request.ConnectionName, out var actor))
|
|
actor.Forward(request);
|
|
else
|
|
{
|
|
_log.Warning("No connection actor for {0}", request.ConnectionName);
|
|
Sender.Tell(new WriteTagResponse(
|
|
request.CorrelationId, false,
|
|
$"Unknown connection: {request.ConnectionName}", DateTimeOffset.UtcNow));
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Routes a <see cref="WriteTagBatchRequest"/> to the child
|
|
/// <see cref="DataConnectionActor"/> that owns the named connection — the batch
|
|
/// counterpart of <see cref="HandleRouteWrite"/>. The manager owns only the
|
|
/// unknown-connection failure (the same split as every other routed message);
|
|
/// the child resolves connected/not-connected and the per-write outcomes.
|
|
/// </summary>
|
|
private void HandleRouteWriteBatch(WriteTagBatchRequest request)
|
|
{
|
|
if (_connectionActors.TryGetValue(request.ConnectionName, out var actor))
|
|
actor.Forward(request);
|
|
else
|
|
{
|
|
_log.Warning("No connection actor for {0}", request.ConnectionName);
|
|
Sender.Tell(new WriteTagBatchResponse(
|
|
request.CorrelationId, false,
|
|
$"Unknown connection: {request.ConnectionName}", DateTimeOffset.UtcNow));
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Routes a <see cref="BrowseNodeCommand"/> from the central UI's OPC UA
|
|
/// Tag Browser to the child <see cref="DataConnectionActor"/> that owns the
|
|
/// named connection. The manager is the only actor that knows whether a
|
|
/// connection exists at this site — so it owns the
|
|
/// <see cref="BrowseFailureKind.ConnectionNotFound"/> failure. Everything
|
|
/// else (capability check, session state, server errors) lives inside the
|
|
/// child where the adapter is held.
|
|
/// </summary>
|
|
private void HandleBrowse(BrowseNodeCommand command)
|
|
{
|
|
if (_connectionActors.TryGetValue(command.ConnectionName, out var actor))
|
|
{
|
|
actor.Forward(command);
|
|
}
|
|
else
|
|
{
|
|
_log.Warning("No connection actor for {0} during browse", command.ConnectionName);
|
|
Sender.Tell(new BrowseNodeResult(
|
|
Array.Empty<BrowseNode>(),
|
|
Truncated: false,
|
|
new BrowseFailure(
|
|
BrowseFailureKind.ConnectionNotFound,
|
|
$"No data connection named '{command.ConnectionName}' at this site.")));
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Routes a <see cref="SearchAddressSpaceCommand"/> from the central UI's OPC
|
|
/// UA tag picker to the child <see cref="DataConnectionActor"/> that owns the
|
|
/// named connection — the address-space analogue of <see cref="HandleBrowse"/>.
|
|
/// Same split: the manager owns <see cref="BrowseFailureKind.ConnectionNotFound"/>
|
|
/// (only it knows the per-site connection set); the capability check and every
|
|
/// other failure live inside the child where the adapter is held.
|
|
/// </summary>
|
|
private void HandleSearch(SearchAddressSpaceCommand command)
|
|
{
|
|
if (_connectionActors.TryGetValue(command.ConnectionName, out var actor))
|
|
{
|
|
actor.Forward(command);
|
|
}
|
|
else
|
|
{
|
|
_log.Warning("No connection actor for {0} during search", command.ConnectionName);
|
|
Sender.Tell(new SearchAddressSpaceResult(
|
|
Array.Empty<AddressSpaceMatch>(),
|
|
CapReached: false,
|
|
new BrowseFailure(
|
|
BrowseFailureKind.ConnectionNotFound,
|
|
$"No data connection named '{command.ConnectionName}' at this site.")));
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Routes a <see cref="ReadTagValuesCommand"/> from the CentralUI's Test
|
|
/// Bindings dialog to the child <see cref="DataConnectionActor"/> that
|
|
/// owns the named connection. Same split as <see cref="HandleBrowse"/> —
|
|
/// the manager owns
|
|
/// <see cref="ReadTagValuesFailureKind.ConnectionNotFound"/> because it is
|
|
/// the only actor with site-level visibility; every other failure
|
|
/// (not connected, server error, timeout) is resolved by the child where
|
|
/// the adapter is held.
|
|
/// </summary>
|
|
private void HandleReadTagValues(ReadTagValuesCommand command)
|
|
{
|
|
if (_connectionActors.TryGetValue(command.ConnectionName, out var actor))
|
|
{
|
|
actor.Forward(command);
|
|
}
|
|
else
|
|
{
|
|
_log.Warning("No connection actor for {0} during test-bindings read", command.ConnectionName);
|
|
Sender.Tell(new ReadTagValuesResult(
|
|
Array.Empty<TagReadOutcome>(),
|
|
new ReadTagValuesFailure(
|
|
ReadTagValuesFailureKind.ConnectionNotFound,
|
|
$"No data connection named '{command.ConnectionName}' at this site.")));
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Handles a <see cref="VerifyEndpointCommand"/> from the Central UI's "Verify"
|
|
/// action — probes the endpoint config WITHOUT persisting it (connect → capture an
|
|
/// untrusted cert → disconnect) and pipes a structured <see cref="VerifyEndpointResult"/>
|
|
/// back to the sender. Verify does NOT require an existing connection (the config may be
|
|
/// brand-new and unsaved), so — unlike the routed browse/read handlers — it does not look
|
|
/// up a connection actor; it runs the probe directly. Only OPC UA is supported today.
|
|
/// </summary>
|
|
private void HandleVerifyEndpoint(VerifyEndpointCommand cmd)
|
|
{
|
|
if (!string.Equals(cmd.Protocol, "OpcUa", StringComparison.OrdinalIgnoreCase))
|
|
{
|
|
Sender.Tell(new VerifyEndpointResult(
|
|
false, VerifyFailureKind.ServerError,
|
|
"Verify is only supported for OPC UA connections.", null));
|
|
return;
|
|
}
|
|
|
|
OpcUaEndpointConfig config;
|
|
try
|
|
{
|
|
(config, _) = OpcUaEndpointConfigSerializer.Deserialize(cmd.ConfigJson);
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
// Defensive: Deserialize is designed not to throw (it classifies Malformed), but
|
|
// a verify must never crash the manager — surface the parse failure as ServerError.
|
|
_log.Warning(ex, "Verify config for {0} could not be parsed", cmd.ConnectionName);
|
|
Sender.Tell(new VerifyEndpointResult(
|
|
false, VerifyFailureKind.ServerError,
|
|
"The endpoint configuration could not be parsed.", null));
|
|
return;
|
|
}
|
|
|
|
var probeLogger = NullLogger.Instance;
|
|
RealOpcUaClient
|
|
.VerifyEndpointAsync(config, _opcUaGlobalOptions, probeLogger, TimeSpan.FromSeconds(6), CancellationToken.None)
|
|
.PipeTo(Sender);
|
|
}
|
|
|
|
private void HandleRemoveConnection(RemoveConnectionCommand command)
|
|
{
|
|
if (_connectionActors.TryGetValue(command.ConnectionName, out var actor))
|
|
{
|
|
Context.Stop(actor);
|
|
_connectionActors.Remove(command.ConnectionName);
|
|
_healthCollector.RemoveConnection(command.ConnectionName);
|
|
// Register row 54 — drop it from the gauges too, so an undeployed connection
|
|
// stops counting toward the total instead of lingering as a permanently
|
|
// not-connected row that would hold the connected < total alert on forever.
|
|
ScadaBridgeTelemetry.RemoveDataConnection(command.ConnectionName);
|
|
_log.Info("Removed DataConnectionActor for {0}", command.ConnectionName);
|
|
}
|
|
}
|
|
|
|
private void HandleGetAllHealthReports(GetAllHealthReports _)
|
|
{
|
|
// Forward health report requests to all connection actors
|
|
foreach (var actor in _connectionActors.Values)
|
|
{
|
|
actor.Forward(new DataConnectionActor.GetHealthReport());
|
|
}
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
protected override SupervisorStrategy SupervisorStrategy()
|
|
{
|
|
return new OneForOneStrategy(
|
|
maxNrOfRetries: 10,
|
|
withinTimeRange: TimeSpan.FromMinutes(1),
|
|
decider: Decider.From(ex =>
|
|
{
|
|
_log.Warning(ex, "DataConnectionActor threw exception, resuming (subscription state preserved)");
|
|
return Directive.Resume;
|
|
}));
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Command to remove a data connection actor.
|
|
/// </summary>
|
|
public record RemoveConnectionCommand(string ConnectionName);
|
|
|
|
/// <summary>
|
|
/// Request for health reports from all active connections.
|
|
/// </summary>
|
|
public record GetAllHealthReports;
|