3c3513ea3e
Item 1: IHistorianDataSource.MaxRawValuesPerRead (Gateway: learned ceiling - 16 = L; 0 elsewhere, guard-tested). RawPageLimit plans every raw page on top of #692's lookahead: with L > 0 the read (page P + boundary ties k + lookahead) is <= L, P = min(N, L - k - 1) (uncapped: L - k - 1); no room => straight to the tie-cluster over-fetch (never an uncapped or underflowing request). One re-plan + re-read when the read taught a new limit or was refused for crowding pre-window rows (HistoryReadLimitExceededException.PreWindowRows): the page shrinks by them. Over-fetch bound min(MaxTieClusterOverfetch, L - 1); slice size never 0. Review fixes: F1 a window starting at/before the epoch counts AVEVA's synthetic row as pre-window (a ceiling-truncated read was reported complete); F2 the page path disables ReverseRawReader's own re-run (cold end-only ceiling 20/N=3000 cost 3,023 reads, now <= 40); F3 crowded look-back re-read around, not refused; F4 the #687 crowding re-read room at least doubles (up to 8 re-reads), so a cluster of hundreds just before a resume point no longer fails on a default gateway; a crowding refusal that leaves no room is BadTooManyOperations, never a tick-by-tick cursor. Item 2: ServerHistorian:EventReadHorizon (default 00:00:00 = exact, unchanged). When set, every fresh HistoryReadEvents window's earlier bound is raised to now - horizon (both directions, all backends). Lossy by design; documented. Item 3 (native TimeAverage/Total re-check) stays blocked on historiangw#27.
172 lines
7.5 KiB
C#
172 lines
7.5 KiB
C#
using Microsoft.Extensions.Configuration;
|
|
using Xunit;
|
|
using ZB.MOM.WW.OtOpcUa.Runtime.Historian;
|
|
|
|
namespace ZB.MOM.WW.OtOpcUa.Runtime.Tests.Historian;
|
|
|
|
/// <summary>
|
|
/// Covers the gateway-shaped <see cref="ServerHistorianOptions.Validate"/> warnings: a disabled or
|
|
/// correctly-configured historian is silent; an enabled one with a blank <c>Endpoint</c> or blank
|
|
/// <c>ApiKey</c> surfaces an operator-facing warning (carrying no secret value text).
|
|
/// </summary>
|
|
public sealed class ServerHistorianOptionsTests
|
|
{
|
|
[Fact]
|
|
public void Disabled_yields_no_warnings()
|
|
=> Assert.Empty(new ServerHistorianOptions { Enabled = false }.Validate());
|
|
|
|
[Fact]
|
|
public void Enabled_without_endpoint_warns()
|
|
{
|
|
var w = new ServerHistorianOptions { Enabled = true, Endpoint = "", ApiKey = "histgw_x_y" }.Validate();
|
|
Assert.Contains(w, m => m.Contains("Endpoint"));
|
|
}
|
|
|
|
[Fact]
|
|
public void Enabled_with_malformed_endpoint_warns()
|
|
{
|
|
// archreview 06/S-11 warning parity: a non-empty but unparseable / non-absolute Endpoint warns
|
|
// too, so the Runtime-side registration logs describe malformed endpoints (not just empty ones),
|
|
// keeping this surface consistent with the Host's fail-fast ServerHistorianOptionsValidator.
|
|
var w = new ServerHistorianOptions { Enabled = true, Endpoint = "not a uri", ApiKey = "histgw_x_y" }.Validate();
|
|
Assert.Contains(w, m => m.Contains("Endpoint"));
|
|
}
|
|
|
|
[Fact]
|
|
public void Enabled_without_apikey_warns()
|
|
{
|
|
var w = new ServerHistorianOptions { Enabled = true, Endpoint = "https://h:5222", ApiKey = "" }.Validate();
|
|
Assert.Contains(w, m => m.Contains("ApiKey"));
|
|
}
|
|
|
|
[Fact]
|
|
public void Valid_config_is_clean()
|
|
=> Assert.Empty(new ServerHistorianOptions { Enabled = true, Endpoint = "https://h:5222", ApiKey = "histgw_x_y" }.Validate());
|
|
|
|
[Fact]
|
|
public void Enabled_with_nonpositive_MaxTieClusterOverfetch_warns()
|
|
{
|
|
var w = new ServerHistorianOptions
|
|
{ Enabled = true, Endpoint = "https://h:5222", ApiKey = "histgw_x_y", MaxTieClusterOverfetch = 0 }
|
|
.Validate();
|
|
Assert.Contains(w, m => m.Contains("MaxTieClusterOverfetch"));
|
|
}
|
|
|
|
// ── S3 HistoryRead concurrency knobs (arch-review 03/S3) ────────────────────────────────────
|
|
|
|
[Fact]
|
|
public void HistoryRead_knob_defaults()
|
|
{
|
|
var o = new ServerHistorianOptions();
|
|
Assert.Equal(4, o.HistoryReadBatchParallelism);
|
|
Assert.Equal(16, o.MaxConcurrentHistoryReadBatches);
|
|
Assert.Equal(TimeSpan.FromSeconds(60), o.HistoryReadDeadline);
|
|
}
|
|
|
|
[Fact]
|
|
public void Enabled_with_nonpositive_HistoryReadBatchParallelism_warns()
|
|
{
|
|
var w = new ServerHistorianOptions
|
|
{ Enabled = true, Endpoint = "https://h:5222", ApiKey = "histgw_x_y", HistoryReadBatchParallelism = 0 }
|
|
.Validate();
|
|
Assert.Contains(w, m => m.Contains("HistoryReadBatchParallelism"));
|
|
}
|
|
|
|
[Fact]
|
|
public void Enabled_with_nonpositive_MaxConcurrentHistoryReadBatches_warns()
|
|
{
|
|
var w = new ServerHistorianOptions
|
|
{ Enabled = true, Endpoint = "https://h:5222", ApiKey = "histgw_x_y", MaxConcurrentHistoryReadBatches = 0 }
|
|
.Validate();
|
|
Assert.Contains(w, m => m.Contains("MaxConcurrentHistoryReadBatches"));
|
|
}
|
|
|
|
[Fact]
|
|
public void Enabled_with_nonpositive_HistoryReadDeadline_warns()
|
|
{
|
|
var w = new ServerHistorianOptions
|
|
{ Enabled = true, Endpoint = "https://h:5222", ApiKey = "histgw_x_y", HistoryReadDeadline = TimeSpan.Zero }
|
|
.Validate();
|
|
Assert.Contains(w, m => m.Contains("HistoryReadDeadline"));
|
|
}
|
|
|
|
[Fact]
|
|
public void MaxTimeWeightedRawRows_defaults_to_one_million_and_warns_when_nonpositive()
|
|
{
|
|
Assert.Equal(1_000_000, new ServerHistorianOptions().MaxTimeWeightedRawRows);
|
|
var w = new ServerHistorianOptions
|
|
{ Enabled = true, Endpoint = "https://h:5222", ApiKey = "histgw_x_y", MaxTimeWeightedRawRows = 0 }
|
|
.Validate();
|
|
Assert.Contains(w, m => m.Contains("MaxTimeWeightedRawRows"));
|
|
}
|
|
|
|
/// <summary>
|
|
/// #674: the HistoryUpdate future-skew bound defaults to one day and binds from configuration as a TimeSpan;
|
|
/// a non-positive value is a deliberate "disabled", not a misconfiguration, so it does not warn.
|
|
/// </summary>
|
|
/// <summary>#691: the ReturnBounds kill switch defaults on and binds off; neither value warns.</summary>
|
|
[Fact]
|
|
public void HonorReturnBounds_defaults_to_true_and_binds_false_silently()
|
|
{
|
|
Assert.True(new ServerHistorianOptions().HonorReturnBounds);
|
|
var bound = new ConfigurationBuilder()
|
|
.AddInMemoryCollection(new Dictionary<string, string?> { ["ServerHistorian:HonorReturnBounds"] = "false" })
|
|
.Build()
|
|
.GetSection(ServerHistorianOptions.SectionName)
|
|
.Get<ServerHistorianOptions>();
|
|
Assert.False(bound!.HonorReturnBounds);
|
|
Assert.Empty(new ServerHistorianOptions
|
|
{ Enabled = true, Endpoint = "https://h:5222", ApiKey = "histgw_x_y", HonorReturnBounds = false }.Validate());
|
|
}
|
|
|
|
/// <summary>#694: the events horizon defaults off, binds as a TimeSpan, and only a negative value warns.</summary>
|
|
[Fact]
|
|
public void EventReadHorizon_defaults_off_binds_and_only_a_negative_value_warns()
|
|
{
|
|
Assert.Equal(TimeSpan.Zero, new ServerHistorianOptions().EventReadHorizon);
|
|
var bound = new ConfigurationBuilder()
|
|
.AddInMemoryCollection(new Dictionary<string, string?> { ["ServerHistorian:EventReadHorizon"] = "3650.00:00:00" })
|
|
.Build()
|
|
.GetSection(ServerHistorianOptions.SectionName)
|
|
.Get<ServerHistorianOptions>();
|
|
Assert.Equal(TimeSpan.FromDays(3650), bound!.EventReadHorizon);
|
|
Assert.Empty(new ServerHistorianOptions
|
|
{ Enabled = true, Endpoint = "https://h:5222", ApiKey = "histgw_x_y", EventReadHorizon = TimeSpan.FromDays(30) }.Validate());
|
|
var w = new ServerHistorianOptions
|
|
{ Enabled = true, Endpoint = "https://h:5222", ApiKey = "histgw_x_y", EventReadHorizon = TimeSpan.FromDays(-1) }.Validate();
|
|
Assert.Contains(w, m => m.Contains("EventReadHorizon"));
|
|
}
|
|
|
|
[Fact]
|
|
public void HistoryUpdateMaxFutureSkew_defaults_to_one_day_binds_and_zero_is_silent()
|
|
{
|
|
Assert.Equal(TimeSpan.FromDays(1), new ServerHistorianOptions().HistoryUpdateMaxFutureSkew);
|
|
var bound = new ConfigurationBuilder()
|
|
.AddInMemoryCollection(new Dictionary<string, string?>
|
|
{
|
|
["ServerHistorian:HistoryUpdateMaxFutureSkew"] = "00:05:00",
|
|
})
|
|
.Build()
|
|
.GetSection(ServerHistorianOptions.SectionName)
|
|
.Get<ServerHistorianOptions>();
|
|
Assert.Equal(TimeSpan.FromMinutes(5), bound!.HistoryUpdateMaxFutureSkew);
|
|
var w = new ServerHistorianOptions
|
|
{ Enabled = true, Endpoint = "https://h:5222", ApiKey = "histgw_x_y", HistoryUpdateMaxFutureSkew = TimeSpan.Zero }
|
|
.Validate();
|
|
Assert.Empty(w);
|
|
}
|
|
|
|
[Fact]
|
|
public void Disabled_with_nonpositive_HistoryRead_knobs_is_silent()
|
|
{
|
|
var w = new ServerHistorianOptions
|
|
{
|
|
Enabled = false,
|
|
HistoryReadBatchParallelism = 0,
|
|
MaxConcurrentHistoryReadBatches = 0,
|
|
HistoryReadDeadline = TimeSpan.Zero,
|
|
}.Validate();
|
|
Assert.Empty(w);
|
|
}
|
|
}
|