IDriver.DriverInstanceId is declared as string in Core.Abstractions; keeping the pipeline key as Guid meant every call site would need .ToString() / Guid.Parse at the boundary. Switching the Resilience types to string removes that friction and lets OtOpcUaServer pass driver.DriverInstanceId directly to the builder in the upcoming server-dispatch wiring PR. - DriverResiliencePipelineBuilder.GetOrCreate + Invalidate + PipelineKey - CapabilityInvoker.ctor + _driverInstanceId field Tests: all 48 Core.Tests still pass. The Invalidate test's keepId / dropId now use distinct "drv-keep" / "drv-drop" literals (previously both were distinct Guid.NewGuid() values, which the sed-driven refactor had collapsed to the same literal — caught pre-commit). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
107 lines
4.8 KiB
C#
107 lines
4.8 KiB
C#
using Polly;
|
|
using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
|
|
|
|
namespace ZB.MOM.WW.OtOpcUa.Core.Resilience;
|
|
|
|
/// <summary>
|
|
/// Executes driver-capability calls through a shared Polly pipeline. One invoker per
|
|
/// <c>(DriverInstance, IDriver)</c> pair; the underlying <see cref="DriverResiliencePipelineBuilder"/>
|
|
/// is process-singleton so all invokers share its cache.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// Per <c>docs/v2/plan.md</c> decisions #143-144 and Phase 6.1 Stream A.3. The server's dispatch
|
|
/// layer routes every capability call (<c>IReadable.ReadAsync</c>, <c>IWritable.WriteAsync</c>,
|
|
/// <c>ITagDiscovery.DiscoverAsync</c>, <c>ISubscribable.SubscribeAsync/UnsubscribeAsync</c>,
|
|
/// <c>IHostConnectivityProbe</c> probe loop, <c>IAlarmSource.SubscribeAlarmsAsync/AcknowledgeAsync</c>,
|
|
/// and all four <c>IHistoryProvider</c> reads) through this invoker.
|
|
/// </remarks>
|
|
public sealed class CapabilityInvoker
|
|
{
|
|
private readonly DriverResiliencePipelineBuilder _builder;
|
|
private readonly string _driverInstanceId;
|
|
private readonly Func<DriverResilienceOptions> _optionsAccessor;
|
|
|
|
/// <summary>
|
|
/// Construct an invoker for one driver instance.
|
|
/// </summary>
|
|
/// <param name="builder">Shared, process-singleton pipeline builder.</param>
|
|
/// <param name="driverInstanceId">The <c>DriverInstance.Id</c> column value.</param>
|
|
/// <param name="optionsAccessor">
|
|
/// Snapshot accessor for the current resilience options. Invoked per call so Admin-edit +
|
|
/// pipeline-invalidate can take effect without restarting the invoker.
|
|
/// </param>
|
|
public CapabilityInvoker(
|
|
DriverResiliencePipelineBuilder builder,
|
|
string driverInstanceId,
|
|
Func<DriverResilienceOptions> optionsAccessor)
|
|
{
|
|
ArgumentNullException.ThrowIfNull(builder);
|
|
ArgumentNullException.ThrowIfNull(optionsAccessor);
|
|
|
|
_builder = builder;
|
|
_driverInstanceId = driverInstanceId;
|
|
_optionsAccessor = optionsAccessor;
|
|
}
|
|
|
|
/// <summary>Execute a capability call returning a value, honoring the per-capability pipeline.</summary>
|
|
/// <typeparam name="TResult">Return type of the underlying driver call.</typeparam>
|
|
public async ValueTask<TResult> ExecuteAsync<TResult>(
|
|
DriverCapability capability,
|
|
string hostName,
|
|
Func<CancellationToken, ValueTask<TResult>> callSite,
|
|
CancellationToken cancellationToken)
|
|
{
|
|
ArgumentNullException.ThrowIfNull(callSite);
|
|
|
|
var pipeline = ResolvePipeline(capability, hostName);
|
|
return await pipeline.ExecuteAsync(callSite, cancellationToken).ConfigureAwait(false);
|
|
}
|
|
|
|
/// <summary>Execute a void-returning capability call, honoring the per-capability pipeline.</summary>
|
|
public async ValueTask ExecuteAsync(
|
|
DriverCapability capability,
|
|
string hostName,
|
|
Func<CancellationToken, ValueTask> callSite,
|
|
CancellationToken cancellationToken)
|
|
{
|
|
ArgumentNullException.ThrowIfNull(callSite);
|
|
|
|
var pipeline = ResolvePipeline(capability, hostName);
|
|
await pipeline.ExecuteAsync(callSite, cancellationToken).ConfigureAwait(false);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Execute a <see cref="DriverCapability.Write"/> call honoring <see cref="WriteIdempotentAttribute"/>
|
|
/// semantics — if <paramref name="isIdempotent"/> is <c>false</c>, retries are disabled regardless
|
|
/// of the tag-level configuration (the pipeline for a non-idempotent write never retries per
|
|
/// decisions #44-45). If <c>true</c>, the call runs through the capability's pipeline which may
|
|
/// retry when the tier configuration permits.
|
|
/// </summary>
|
|
public async ValueTask<TResult> ExecuteWriteAsync<TResult>(
|
|
string hostName,
|
|
bool isIdempotent,
|
|
Func<CancellationToken, ValueTask<TResult>> callSite,
|
|
CancellationToken cancellationToken)
|
|
{
|
|
ArgumentNullException.ThrowIfNull(callSite);
|
|
|
|
if (!isIdempotent)
|
|
{
|
|
var noRetryOptions = _optionsAccessor() with
|
|
{
|
|
CapabilityPolicies = new Dictionary<DriverCapability, CapabilityPolicy>
|
|
{
|
|
[DriverCapability.Write] = _optionsAccessor().Resolve(DriverCapability.Write) with { RetryCount = 0 },
|
|
},
|
|
};
|
|
var pipeline = _builder.GetOrCreate(_driverInstanceId, $"{hostName}::non-idempotent", DriverCapability.Write, noRetryOptions);
|
|
return await pipeline.ExecuteAsync(callSite, cancellationToken).ConfigureAwait(false);
|
|
}
|
|
|
|
return await ExecuteAsync(DriverCapability.Write, hostName, callSite, cancellationToken).ConfigureAwait(false);
|
|
}
|
|
|
|
private ResiliencePipeline ResolvePipeline(DriverCapability capability, string hostName) =>
|
|
_builder.GetOrCreate(_driverInstanceId, hostName, capability, _optionsAccessor());
|
|
}
|