859d63178a
Integration-sweep follow-up #6 (SQL leg). The sweep flagged 7 heavy 2-node deploy/failover/reconnect E2E tests as 'time out under amd64-emulated SQL' and suggested raising deadlines. That diagnosis was WRONG: run against real (native-amd64) SQL on the Docker host, they still hang — even at 4x deadline. Root cause is that these tests had never actually run against real SQL, only the EF in-memory provider, which does NOT enforce foreign keys. Two distinct defects, both hidden by in-memory: 1. Missing FK-parent seed (5 tests). The deploy records a NodeDeploymentState row per node, FK'd to ClusterNode (FK_NodeDeploymentState_ClusterNode_NodeId). The tests never seeded ServerCluster + ClusterNode, so on SQL each node-state INSERT throws and the deploy never seals (waits the full deadline regardless of size). Added TwoNodeClusterHarness.SeedDefaultClusterAsync (seeds a ServerCluster + a ClusterNode per node; Warm/NodeCount=2 to satisfy the SQL CHECK constraint CK_ServerCluster_RedundancyMode_NodeCount AND the ClusterEnabledNodeCountMismatch validator). Called it in DeployHappyPath x2 / Failover / FleetDiagnostics / EquipmentNamespace; fixed DriverReconnect to seed node B + NodeCount=2. 2. Stale EquipmentId (EquipmentNamespace test; pre-existing on BOTH providers). Seeded EquipmentId='eq-1', but the later-added EquipmentIdNotDerived validator requires EquipmentId == DeriveEquipmentId(EquipmentUuid) ('EQ-'+first 12 hex). Fixed the seed to a canonical id + matching UUID. Only surfaced once the FK fix let the deploy reach equipment validation. Also added OTOPCUA_HARNESS_SQL_HOST / OTOPCUA_HARNESS_LDAP_HOST overrides so the harness fixtures can run on the native-amd64 Docker host (avoids arm64 mssql emulation entirely). Verified: the 5 SQL-backed classes go 11/11 green vs native SQL; in-memory default unregressed (12/12). RoslynVirtualTagEvaluatorTests racing test is a pre-existing flaky race (not SQL-backed; passes in isolation) — left as-is.
120 lines
5.2 KiB
C#
120 lines
5.2 KiB
C#
using Microsoft.EntityFrameworkCore;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using Shouldly;
|
|
using Xunit;
|
|
using ZB.MOM.WW.OtOpcUa.Commons.Interfaces;
|
|
using ZB.MOM.WW.OtOpcUa.Commons.Messages.Admin;
|
|
using ZB.MOM.WW.OtOpcUa.Configuration;
|
|
using ZB.MOM.WW.OtOpcUa.Configuration.Enums;
|
|
|
|
namespace ZB.MOM.WW.OtOpcUa.Host.IntegrationTests;
|
|
|
|
/// <summary>
|
|
/// End-to-end deploy: AdminOperationsActor → ConfigPublishCoordinator → DriverHostActor on both
|
|
/// nodes → ApplyAck → coordinator seals. Verifies the cluster singleton + DistributedPubSub
|
|
/// dispatch path actually works against the real Akka cluster the harness builds.
|
|
/// </summary>
|
|
public sealed class DeployHappyPathTests
|
|
{
|
|
private static CancellationToken Ct => TestContext.Current.CancellationToken;
|
|
|
|
/// <summary>Verifies that StartDeployment seals after both nodes apply.</summary>
|
|
[Fact]
|
|
public async Task StartDeployment_seals_after_both_nodes_apply()
|
|
{
|
|
await using var harness = await TwoNodeClusterHarness.StartAsync();
|
|
await harness.SeedDefaultClusterAsync();
|
|
|
|
await using var scope = harness.NodeA.Services.CreateAsyncScope();
|
|
var client = scope.ServiceProvider.GetRequiredService<IAdminOperationsClient>();
|
|
|
|
var result = await client.StartDeploymentAsync(createdBy: "alice@test", Ct);
|
|
|
|
result.Outcome.ShouldBe(StartDeploymentOutcome.Accepted);
|
|
result.DeploymentId.ShouldNotBeNull();
|
|
var deploymentId = result.DeploymentId!.Value.Value;
|
|
|
|
// Wait up to 15s for coordinator to seal after both DriverHostActors ack.
|
|
await WaitForAsync(async () =>
|
|
{
|
|
await using var db = await CreateDbAsync(harness);
|
|
var d = await db.Deployments.AsNoTracking().FirstOrDefaultAsync(d => d.DeploymentId == deploymentId, Ct);
|
|
return d?.Status == DeploymentStatus.Sealed;
|
|
}, TimeSpan.FromSeconds(15));
|
|
|
|
await using var db = await CreateDbAsync(harness);
|
|
var deployment = await db.Deployments.AsNoTracking()
|
|
.FirstAsync(d => d.DeploymentId == deploymentId, Ct);
|
|
deployment.Status.ShouldBe(DeploymentStatus.Sealed);
|
|
deployment.SealedAtUtc.ShouldNotBeNull();
|
|
|
|
var nodeStates = await db.NodeDeploymentStates.AsNoTracking()
|
|
.Where(s => s.DeploymentId == deploymentId)
|
|
.ToListAsync(Ct);
|
|
nodeStates.Count.ShouldBe(2);
|
|
nodeStates.ShouldAllBe(s => s.Status == NodeDeploymentStatus.Applied);
|
|
}
|
|
|
|
/// <summary>Verifies that replaying dispatch to same revision is idempotent and a no-op.</summary>
|
|
[Fact]
|
|
public async Task Replaying_dispatch_to_same_revision_is_idempotent_no_op()
|
|
{
|
|
await using var harness = await TwoNodeClusterHarness.StartAsync();
|
|
await harness.SeedDefaultClusterAsync();
|
|
|
|
await using var scope = harness.NodeA.Services.CreateAsyncScope();
|
|
var client = scope.ServiceProvider.GetRequiredService<IAdminOperationsClient>();
|
|
|
|
var first = await client.StartDeploymentAsync(createdBy: "alice@test", Ct);
|
|
first.Outcome.ShouldBe(StartDeploymentOutcome.Accepted);
|
|
|
|
await WaitForAsync(async () =>
|
|
{
|
|
await using var db = await CreateDbAsync(harness);
|
|
var d = await db.Deployments.AsNoTracking()
|
|
.FirstOrDefaultAsync(d => d.DeploymentId == first.DeploymentId!.Value.Value, Ct);
|
|
return d?.Status == DeploymentStatus.Sealed;
|
|
}, TimeSpan.FromSeconds(15));
|
|
|
|
// Same DB state → same revision hash → AdminOperations short-circuits with NoChanges,
|
|
// OR (if it accepts) the second dispatch is idempotent (DriverHostActor recognises
|
|
// _currentRevision == msg.RevisionHash and acks Applied without re-applying).
|
|
var second = await client.StartDeploymentAsync(createdBy: "alice@test", Ct);
|
|
|
|
if (second.Outcome == StartDeploymentOutcome.Accepted)
|
|
{
|
|
// Second deployment row should also seal quickly because both drivers immediate-ack.
|
|
await WaitForAsync(async () =>
|
|
{
|
|
await using var db = await CreateDbAsync(harness);
|
|
var d = await db.Deployments.AsNoTracking()
|
|
.FirstOrDefaultAsync(d => d.DeploymentId == second.DeploymentId!.Value.Value, Ct);
|
|
return d?.Status == DeploymentStatus.Sealed;
|
|
}, TimeSpan.FromSeconds(15));
|
|
|
|
second.RevisionHash!.Value.Value.ShouldBe(first.RevisionHash!.Value.Value);
|
|
}
|
|
else
|
|
{
|
|
second.Outcome.ShouldBeOneOf(StartDeploymentOutcome.NoChanges, StartDeploymentOutcome.AnotherDeploymentInFlight);
|
|
}
|
|
}
|
|
|
|
private static async Task<OtOpcUaConfigDbContext> CreateDbAsync(TwoNodeClusterHarness harness)
|
|
{
|
|
var factory = harness.NodeA.Services.GetRequiredService<IDbContextFactory<OtOpcUaConfigDbContext>>();
|
|
return await factory.CreateDbContextAsync();
|
|
}
|
|
|
|
private static async Task WaitForAsync(Func<Task<bool>> condition, TimeSpan timeout)
|
|
{
|
|
var deadline = DateTime.UtcNow + timeout;
|
|
while (DateTime.UtcNow < deadline)
|
|
{
|
|
if (await condition()) return;
|
|
await Task.Delay(200);
|
|
}
|
|
throw new TimeoutException($"Condition not met within {timeout}");
|
|
}
|
|
}
|