dohertj2/lmxopcua
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Phase 6.1 Stream A (partial) - Polly resilience foundation: pipeline builder + CapabilityInvoker + per-tier defaults #78

Merged
dohertj2 merged 6 commits from phase-6-1-stream-a-resilience into v2 2026-04-19 07:33:55 -04:00
Conversation 0 Commits 6 Files Changed 21 +36 -21
1 changed files with 36 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d2f3a243cd - Show all commits

31
src/ZB.MOM.WW.OtOpcUa.Server/OpcUa/DriverNodeManager.cs
View File

@@ -484,12 +484,16 @@ public sealed class DriverNodeManager : CustomNodeManager2, IAddressSpaceBuilder
try try
{ {
var driverResult = History.ReadRawAsync( var driverResult = _invoker.ExecuteAsync(
DriverCapability.HistoryRead,
_driver.DriverInstanceId,
async ct => await History.ReadRawAsync(
fullRef, fullRef,
details.StartTime, details.StartTime,
details.EndTime, details.EndTime,
details.NumValuesPerNode, details.NumValuesPerNode,
CancellationToken.None).GetAwaiter().GetResult(); ct).ConfigureAwait(false),
CancellationToken.None).AsTask().GetAwaiter().GetResult();
WriteResult(results, errors, i, StatusCodes.Good, WriteResult(results, errors, i, StatusCodes.Good,
BuildHistoryData(driverResult.Samples), driverResult.ContinuationPoint); BuildHistoryData(driverResult.Samples), driverResult.ContinuationPoint);
@@ -544,13 +548,17 @@ public sealed class DriverNodeManager : CustomNodeManager2, IAddressSpaceBuilder
try try
{ {
var driverResult = History.ReadProcessedAsync( var driverResult = _invoker.ExecuteAsync(
DriverCapability.HistoryRead,
_driver.DriverInstanceId,
async ct => await History.ReadProcessedAsync(
fullRef, fullRef,
details.StartTime, details.StartTime,
details.EndTime, details.EndTime,
interval, interval,
aggregate.Value, aggregate.Value,
CancellationToken.None).GetAwaiter().GetResult(); ct).ConfigureAwait(false),
CancellationToken.None).AsTask().GetAwaiter().GetResult();
WriteResult(results, errors, i, StatusCodes.Good, WriteResult(results, errors, i, StatusCodes.Good,
BuildHistoryData(driverResult.Samples), driverResult.ContinuationPoint); BuildHistoryData(driverResult.Samples), driverResult.ContinuationPoint);
@@ -597,8 +605,11 @@ public sealed class DriverNodeManager : CustomNodeManager2, IAddressSpaceBuilder
try try
{ {
var driverResult = History.ReadAtTimeAsync( var driverResult = _invoker.ExecuteAsync(
fullRef, requestedTimes, CancellationToken.None).GetAwaiter().GetResult(); DriverCapability.HistoryRead,
_driver.DriverInstanceId,
async ct => await History.ReadAtTimeAsync(fullRef, requestedTimes, ct).ConfigureAwait(false),
CancellationToken.None).AsTask().GetAwaiter().GetResult();
WriteResult(results, errors, i, StatusCodes.Good, WriteResult(results, errors, i, StatusCodes.Good,
BuildHistoryData(driverResult.Samples), driverResult.ContinuationPoint); BuildHistoryData(driverResult.Samples), driverResult.ContinuationPoint);
@@ -651,12 +662,16 @@ public sealed class DriverNodeManager : CustomNodeManager2, IAddressSpaceBuilder
try try
{ {
var driverResult = History.ReadEventsAsync( var driverResult = _invoker.ExecuteAsync(
DriverCapability.HistoryRead,
_driver.DriverInstanceId,
async ct => await History.ReadEventsAsync(
sourceName: fullRef, sourceName: fullRef,
startUtc: details.StartTime, startUtc: details.StartTime,
endUtc: details.EndTime, endUtc: details.EndTime,
maxEvents: maxEvents, maxEvents: maxEvents,
cancellationToken: CancellationToken.None).GetAwaiter().GetResult(); cancellationToken: ct).ConfigureAwait(false),
CancellationToken.None).AsTask().GetAwaiter().GetResult();
WriteResult(results, errors, i, StatusCodes.Good, WriteResult(results, errors, i, StatusCodes.Good,
BuildHistoryEvent(driverResult.Events), driverResult.ContinuationPoint); BuildHistoryEvent(driverResult.Events), driverResult.ContinuationPoint);