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

fix(mtconnect): back off a /sample re-baseline that resolved nothing; scope Test Connect to the configured device

Browse Source 
Driver.MTConnect-001 (Medium): StreamVerdict.Reopen reset the reconnect ladder
unconditionally. The InvalidDataException catch that routes an Agent OUT_OF_RANGE
to a /current re-baseline also catches an unparseable chunk and an over-sized
multipart part - neither of which a re-baseline can resolve - so the pump reopened
and failed with no delay at any point: two HTTP requests and one Warning per
iteration, forever. The Reopen arm now uses the same discriminator the transient
arm does (did THIS connection deliver a chunk?), so a buffer roll behind a working
stream still reopens instantly while a re-baseline that resolved nothing advances
BackoffFor.

Driver.MTConnect-002 (Medium): MTConnectDriverProbe requested {AgentUri}/probe
while MTConnectAgentClient requests {AgentUri}/{DeviceName}/probe, so a mistyped or
since-renamed deviceName showed GREEN on Test Connect and then Faulted the driver
at InitializeAsync (an unknown device path answers MTConnectError under HTTP 200).
The probe's minimal DTO now reads deviceName - the rule is 'which keys compose the
URL', not 'which keys are cheap to read'.

Driver.MTConnect-008 (Low): corrected two stale claims that a since-changed
RawBrowseCommitMapper invalidated (see Driver.MTConnect-003, which remains open and
belongs in AdminUI), and made DiscoverAsync log the options snapshot it
deliberately read once instead of the field.

Tests: 538 pass (534 base + 4 new, each red before its fix); AdminUI.Tests 1466 pass.
This commit is contained in:
Joseph Doherty
2026-08-10 06:51:39 -04:00
parent b990adae55
commit 6c63bf8fab
7 changed files with 239 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.MTConnect/MTConnectDriver.cs
+41 -13
View File
@@ -1224,7 +1224,7 @@ public sealed class MTConnectDriver
// downstream). Its data items are unreachable either way.
_logger.LogWarning(
"MTConnect driver {DriverInstanceId} skipped a device in {AgentUri}'s /probe model that declares neither a name nor an id; it cannot be given a browse path.",
_driverInstanceId, _options.AgentUri);
_driverInstanceId, options.AgentUri);
continue;
}
@@ -1242,7 +1242,7 @@ public sealed class MTConnectDriver
{
_logger.LogWarning(
"MTConnect driver {DriverInstanceId} is scoped to device '{DeviceScope}', but {AgentUri}'s /probe model declares no device with that name or id ({DeclaredCount} declared). The browse is empty because the scope matched nothing, not because the Agent has nothing.",
_driverInstanceId, deviceScope, _options.AgentUri, model.Devices.Count);
_driverInstanceId, deviceScope, options.AgentUri, model.Devices.Count);
return;
}
@@ -1252,7 +1252,7 @@ public sealed class MTConnectDriver
_driverInstanceId,
devices,
variables,
_options.AgentUri,
options.AgentUri,
deviceScope is null or "" ? string.Empty : $" (scoped to '{deviceScope}')");
}
@@ -1854,10 +1854,13 @@ public sealed class MTConnectDriver
/// "just re-initialize" would be a silent permanent deadlock.
/// </para>
/// <para>
/// <b>Backoff applies to failures only.</b> A re-baseline is a protocol event, not a
/// fault, so it reopens the stream immediately and resets the attempt count; only a
/// genuine failure (dropped connection, blown heartbeat, a re-baseline that itself
/// failed) advances <see cref="BackoffFor"/>.
/// <b>Backoff applies to failures only — and to a re-baseline that resolved nothing.</b>
/// A re-baseline behind a stream that delivered is a protocol event, not a fault, so it
/// reopens immediately and resets the attempt count. One on a connection that delivered
/// nothing advances <see cref="BackoffFor"/> like any other failure, because the
/// <see cref="InvalidDataException"/> path that reaches it also carries conditions a
/// <c>/current</c> cannot resolve (an unparseable chunk, an over-sized part) and would
/// otherwise reopen-and-fail as fast as the Agent can answer.
/// </para>
/// </remarks>
private async Task RunSampleStreamAsync(
@@ -1927,8 +1930,21 @@ public sealed class MTConnectDriver
return;
case StreamVerdict.Reopen:
attempt = 0;
_reconnectAttempts = 0;
// A re-baseline behind a stream that DELIVERED is the protocol event this
// verdict was written for — a sequence gap or an OUT_OF_RANGE rejection, both
// of which the /current genuinely resolves — so it reopens immediately on a
// clean ladder.
//
// One that delivered NOTHING is not necessarily resolved by anything. The
// InvalidDataException catch that routes OUT_OF_RANGE here also catches an
// unparseable chunk and an over-sized part, and a /current cannot fix either:
// resetting the ladder there reopens instantly, fails identically, and spends
// one /sample AND one /current per iteration forever — the unbounded hot loop
// every other arm of this pump (the Unsupported latch, the backoff floor, the
// non-positive cap) exists to prevent. The discriminator is the same one the
// transient arm below uses, for the same reason.
attempt = outcome.DeliveredAny ? 0 : attempt + 1;
_reconnectAttempts = attempt;
break;
@@ -3208,10 +3224,22 @@ public sealed class MTConnectDriver
/// <b>Coercion type precedence</b> (see <see cref="MTConnectDriverOptions.RawTags"/>):
/// the blob's own <c>driverDataType</c>, else a <see cref="MTConnectDriverOptions.Tags"/>
/// entry naming the same DataItem id, else the Agent's <c>/probe</c> declaration for that
/// data item, else <see cref="DriverDataType.String"/>. The third step is what makes a
/// browse-committed tag work: <c>RawBrowseCommitMapper</c> writes only the address into
/// the blob, so without it every value from the address picker would publish as text
/// under a numerically-typed OPC UA node.
/// data item, else <see cref="DriverDataType.String"/>.
/// </para>
/// <para>
/// ⚠️ <b>The third step does NOT currently rescue a browse-committed tag, and the
/// AdminUI is where that has to be fixed.</b> It was written on the premise that
/// <c>RawBrowseCommitMapper</c> writes only the address into the blob — true when this
/// was authored, false at HEAD: the MTConnect branch of
/// <c>RawBrowseCommitMapper.BuildTagConfig</c> now emits a whole
/// <c>MTConnectTagConfigModel</c>, whose <c>ToJson</c> unconditionally writes
/// <c>"dataType"</c> from a field defaulting to <see cref="DriverDataType.String"/>. That
/// is a non-blank authored type, so step 1 wins and this step is never reached — every
/// browse-committed tag coerces to text while its raw-tag node was typed <c>Double</c> /
/// <c>Int64</c> from the SAME probe inference (<c>RawBrowseCommitMapper.MapLeaf</c>).
/// The step is kept because it is still the correct rule and still serves a blob authored
/// by hand, by CSV or by API with no type; see
/// <c>code-reviews/Driver.MTConnect/findings.md</c> (Driver.MTConnect-003).
/// </para>
/// </remarks>
/// <param name="options">The options document to derive from.</param>