fix(adminui): lane D-b review r0 fixes (I1, M1, M2, M5-M9, N1-N3, N5, H3)
I1: /hosts eviction keyed off the AUTHORED DriverInstances, so a driver deleted in /raw but not yet deployed - still running, still publishing - vanished every tick. The stores' sweep is now EvictUnconfiguredStale(set, olderThanUtc): an entry goes only when unconfigured AND its PublishedUtc is older than 60 s. Tests cover unconfigured+fresh kept (positive control), unconfigured+stale evicted, configured+stale kept, and the deploy hand-off. M1: Test Connect falls back to the driver's documented ProbeTimeoutSeconds default (Galaxy 30, OpcUaClient 15, ...) when the key is absent. M2: the budget never undercuts the config's root timeoutMs (+1 s). M5: RawBrowseModal compares the open generation captured before the await, so a close-then-reopen mid-open closes the stale session. M6: /alarms-historian keeps a 30 s re-poll on 'not registered' (a driver node may still be starting) instead of stopping for good. M7: /scripts source fetch failure shows in the dialog, not the error boundary. M8: the export modal maps only its preview rows; the endpoint writes via Results.Text (no second byte[] copy). M9: /hosts config queries are ordered, so SequenceEqual change detection holds. N1 tooltip, N2 CRLF-safe regex, N3 throttled Warning for subscriber faults, N5 equipment-import help text now describes RFC 4180 quoting. H3: MonacoEditor documents that themes are page-global. Refs #745 Claude-Session: https://claude.ai/code/session_01Ub9hGmYLQvn9XETzw7CMsT
This commit is contained in:
@@ -17,11 +17,11 @@
|
||||
<h4 class="mb-0">Alarms historian sink</h4>
|
||||
</div>
|
||||
|
||||
<div class="text-muted small mb-3">Polling every @PollSeconds s.</div>
|
||||
<div class="text-muted small mb-3">Polling every @((int)(_interval == TimeSpan.Zero ? PollSeconds : _interval.TotalSeconds)) s.</div>
|
||||
|
||||
@if (_reading is { Availability: HistorianSinkAvailability.NotOnThisRole })
|
||||
{
|
||||
<section class="panel notice rise mt-3" style="animation-delay:.04s">@_reading.Message</section>
|
||||
<section class="panel notice rise mt-3" style="animation-delay:.04s">@_reading.Message Checking again every @((int)HistorianSinkStatusReader.NotRegisteredPollInterval.TotalSeconds) s in case the node is still starting.</section>
|
||||
}
|
||||
else if (_status is null && _reading is { Availability: HistorianSinkAvailability.Unavailable })
|
||||
{
|
||||
@@ -71,16 +71,17 @@ else
|
||||
private HistorianSinkReading? _reading;
|
||||
private Timer? _timer;
|
||||
private int _tickRunning;
|
||||
private TimeSpan _interval;
|
||||
private readonly CancellationTokenSource _cts = new();
|
||||
private volatile bool _disposed;
|
||||
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
await RefreshAsync();
|
||||
// No historian on this role is permanent — don't poll for it.
|
||||
if (_reading?.Availability == HistorianSinkAvailability.NotOnThisRole) return;
|
||||
_timer = new Timer(_ => _ = InvokeAsync(RefreshAsync), null,
|
||||
TimeSpan.FromSeconds(PollSeconds), TimeSpan.FromSeconds(PollSeconds));
|
||||
// "Not registered" is usually permanent (an admin-only node) but can also be a driver node still
|
||||
// starting up, so it keeps a slow re-poll instead of stopping for good (review r0 M6).
|
||||
_interval = HistorianSinkStatusReader.PollIntervalFor(_reading?.Availability);
|
||||
_timer = new Timer(_ => _ = InvokeAsync(RefreshAsync), null, _interval, _interval);
|
||||
}
|
||||
|
||||
private async Task RefreshAsync()
|
||||
@@ -105,7 +106,16 @@ else
|
||||
Volatile.Write(ref _tickRunning, 0);
|
||||
}
|
||||
|
||||
if (!_disposed) StateHasChanged();
|
||||
if (_disposed) return;
|
||||
var interval = HistorianSinkStatusReader.PollIntervalFor(_reading?.Availability);
|
||||
if (_timer is not null && interval != _interval)
|
||||
{
|
||||
_interval = interval;
|
||||
try { _timer.Change(interval, interval); }
|
||||
catch (ObjectDisposedException) { return; }
|
||||
}
|
||||
|
||||
StateHasChanged();
|
||||
}
|
||||
|
||||
private static string StateChipClass(HistorianDrainState state) => state switch
|
||||
|
||||
@@ -329,6 +329,9 @@ else
|
||||
@code {
|
||||
private const int RefreshIntervalSeconds = 5;
|
||||
|
||||
// An unconfigured driver's snapshot must be this old before eviction (≈ 12 health publishes).
|
||||
private static readonly TimeSpan EvictUnconfiguredAfter = TimeSpan.FromSeconds(60);
|
||||
|
||||
private List<MemberRow>? _rows;
|
||||
private bool _refreshing;
|
||||
private DateTime? _lastRefreshUtc;
|
||||
@@ -434,22 +437,29 @@ else
|
||||
try
|
||||
{
|
||||
await using var db = await DbFactory.CreateDbContextAsync(_cts.Token);
|
||||
// Ordered: the change test below compares with SequenceEqual (review r0 M9).
|
||||
_nodes = await db.ClusterNodes.AsNoTracking()
|
||||
.OrderBy(n => n.ClusterId).ThenBy(n => n.NodeId)
|
||||
.Select(n => new HostsNodeInfo(n.ClusterId, n.NodeId, n.Host, n.OpcUaPort))
|
||||
.ToListAsync(_cts.Token);
|
||||
_instances = await db.DriverInstances.AsNoTracking()
|
||||
.OrderBy(d => d.DriverInstanceId)
|
||||
.Select(d => new HostsDriverInstanceInfo(d.DriverInstanceId, d.ClusterId, d.Name, d.DriverType, d.Enabled))
|
||||
.ToListAsync(_cts.Token);
|
||||
|
||||
// Evict snapshots of driver instances that are no longer configured (deleted, or re-created
|
||||
// under a new id). The stores have no other removal path, so without this a removed driver
|
||||
// stays on this page as a frozen row until the admin node restarts. Only a SUCCESSFUL load
|
||||
// reaches here; the failure path below blanks _instances and must never sweep the stores.
|
||||
// under a new id) AND have stopped publishing. The stores have no other removal path, so
|
||||
// without this a removed driver stays on this page as a frozen row until the admin node
|
||||
// restarts. DriverInstances is the AUTHORED table: a driver deleted in /raw keeps running (and
|
||||
// publishing every few seconds) until the next deploy, so staleness is what proves it stopped.
|
||||
// Only a SUCCESSFUL load reaches here; the failure path below blanks _instances and must
|
||||
// never sweep the stores.
|
||||
var configured = _instances
|
||||
.Select(i => i.DriverInstanceId)
|
||||
.ToHashSet(StringComparer.OrdinalIgnoreCase);
|
||||
var evicted = DriverStore.RetainOnly(configured);
|
||||
ResilienceStore.RetainOnly(configured);
|
||||
var staleBefore = DateTime.UtcNow - EvictUnconfiguredAfter;
|
||||
var evicted = DriverStore.EvictUnconfiguredStale(configured, staleBefore);
|
||||
ResilienceStore.EvictUnconfiguredStale(configured, staleBefore);
|
||||
|
||||
return evicted > 0
|
||||
|| !_nodes.SequenceEqual(previousNodes)
|
||||
|
||||
@@ -89,7 +89,11 @@ else
|
||||
<button type="button" class="btn-close" aria-label="Close" @onclick="CloseSource"></button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
@if (src is null || (_sourceLoaded && _sourceCode is null))
|
||||
@if (_sourceError is not null)
|
||||
{
|
||||
<div class="panel notice notice-alert mb-0">@_sourceError</div>
|
||||
}
|
||||
else if (src is null || (_sourceLoaded && _sourceCode is null))
|
||||
{
|
||||
<p class="text-muted mb-0">This script is no longer loaded.</p>
|
||||
}
|
||||
@@ -123,6 +127,7 @@ else
|
||||
// operator opened another row, or closed the dialog, while the first one was in flight).
|
||||
private string? _sourceCode;
|
||||
private bool _sourceLoaded;
|
||||
private string? _sourceError;
|
||||
private int _sourceGeneration;
|
||||
|
||||
protected override async Task OnInitializedAsync()
|
||||
@@ -147,8 +152,22 @@ else
|
||||
_sourceCode = null;
|
||||
_sourceLoaded = false;
|
||||
|
||||
await using var db = await DbFactory.CreateDbContextAsync();
|
||||
var source = await ScriptListQueries.LoadSourceAsync(db, scriptId);
|
||||
_sourceError = null;
|
||||
string? source;
|
||||
try
|
||||
{
|
||||
await using var db = await DbFactory.CreateDbContextAsync();
|
||||
source = await ScriptListQueries.LoadSourceAsync(db, scriptId);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
// A ConfigDb hiccup must not escape the click handler into the page's error boundary (review r0 M7).
|
||||
if (generation != _sourceGeneration) return;
|
||||
_sourceError = $"The script source could not be loaded: {ex.Message}";
|
||||
_sourceLoaded = true;
|
||||
return;
|
||||
}
|
||||
|
||||
if (generation != _sourceGeneration) return;
|
||||
_sourceCode = source;
|
||||
_sourceLoaded = true;
|
||||
@@ -160,5 +179,6 @@ else
|
||||
_sourceScriptId = null;
|
||||
_sourceCode = null;
|
||||
_sourceLoaded = false;
|
||||
_sourceError = null;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user