mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-26 04:19:53 +08:00
# Description This PR fixes bounded ManagedSession reconnect cleanup and reorganizes the sample applications into domain-focused folders. ## Reconnect cleanup - Bounds reconnect integration cleanup with independent 30-second close and dispose limits. - Sends `CloseSession` through the awaited transport request path during `Session.DisposeAsync`. - Preserves explicit `Session.CloseAsync` behavior that waits for or cancels outstanding publish requests. - Covers the disposal request path with a regression test. ## Sample organization - `samples/OpenUsd`: `GeneratorServer`, `SiteCompositionServer` - `samples/Redundancy`: `RedundantClient`, `RedundantServer`, `RedundantPubSub` - `samples/Isa95`: `MinimalIsa95Server` - `samples/MinimalApi`: `MinimalBoilerServer`, `MinimalCalcServer`, `MinimalClient` - `samples/DI`: `PumpDeviceIntegrationServer` - `samples/Lds`: `ConsoleLdsServer` - `samples/Reference`: `ConsoleReferenceClient`, `ConsoleReferenceServer` - `samples/PubSub`: `ConsoleReferencePubSubClient` `UA.slnx` now exposes the same requested domain groups. Project references, tests, runtime sample probes, CI workflows, Dockerfiles, Compose files, helper scripts, and documentation were updated to the new paths. `samples/Robotics/MinimalRobotServer` remains under `Robotics`. ## Validation - `dotnet build UA.slnx` - 3 Redundancy short-haul sample tests - 70 DI sample tests - 914 OpenUSD tests - 1 WotCon model-materialization test - 137 AOT tests - `docker compose config` for all 6 moved Redundancy Compose files ## Related Issues - Fixes #4273 ## Checklist - [ ] I have signed the [CLA](https://opcfoundation.org/license/cla/ContributorLicenseAgreementv1.0.pdf) and read the [CONTRIBUTING](https://github.com/OPCFoundation/UA-.NETStandard/blob/master/CONTRIBUTING.md) doc. - [x] I have added tests that prove my fix is effective or that my feature works and increased code coverage. - [x] I have added all necessary documentation. - [x] I have verified that my changes do not introduce new build or analyzer warnings. - [x] I built the complete `UA.slnx` solution locally. - [ ] I ran all tests locally against at least .NET Framework and .NET 10. - [ ] I fixed all failing and flaky tests in the CI pipelines and all CodeQL warnings. - [x] I have addressed all PR feedback received. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: marcschier <11168470+marcschier@users.noreply.github.com> Co-authored-by: Marc Schier <mschier@microsoft.com> Co-authored-by: Marc Schier <marcschier@users.noreply.github.com> Copilot-Session: a2c2838f-74ae-4997-a1d4-50574d9e0636
120 lines
3.9 KiB
YAML
120 lines
3.9 KiB
YAML
# RedundantPubSub — OPC UA PubSub active/standby HA sample.
|
|
#
|
|
# Profiles:
|
|
# strong fixed 3-node Raft publisher set + fixed 3-node Raft subscriber set
|
|
# (default, real cross-container active/standby on BOTH sides)
|
|
# demo single container running two in-process publishers + subscriber over loopback UDP by default
|
|
#
|
|
# Run from the repository ROOT:
|
|
# docker compose -f samples/Redundancy/RedundantPubSub/docker-compose.yml up --build
|
|
#
|
|
# Publisher HA — observe the subscriber logs. With HA_MODE=hot, killing the active publisher
|
|
# (docker kill <publisher-a|b|c>) should produce on every subscriber:
|
|
# HA OK: sequence continued <n> -> <m> across failover (gap, no reset)
|
|
# With HA_MODE=cold, the promoted publisher restarts its local writer SequenceNumber and the subscriber logs:
|
|
# DATA LOSS: sequence reset <n> -> <k> (subscriber must reset de-duplication)
|
|
#
|
|
# Subscriber HA — the three subscribers form their own Raft set, so only the elected-active
|
|
# subscriber dispatches received data sets to its sink (look for the "Subscriber ... -> Active"
|
|
# role line and the "DataSet with N field(s) received" lines). Killing the active subscriber
|
|
# (docker kill <subscriber-a|b|c>) promotes a standby, which resumes dispatching without
|
|
# losing the multicast stream that every replica already receives.
|
|
|
|
x-pubsub-image: &pubsub-image
|
|
build:
|
|
context: ../../..
|
|
dockerfile: samples/Redundancy/RedundantPubSub/Dockerfile
|
|
image: opcua-redundant-pubsub
|
|
|
|
x-publisher-env: &publisher-env
|
|
ROLE: publisher
|
|
HA_MODE: ${HA_MODE:-hot}
|
|
HA_ELECTION: leader-election
|
|
HA_RAFT_MEMBERS: "3"
|
|
HA_RAFT_BIND: tcp://0.0.0.0:6560
|
|
HA_INSECURE: ${HA_INSECURE:-true}
|
|
HA_RECORD_KEY: ${HA_RECORD_KEY:-}
|
|
PUBSUB_ENDPOINT: ${PUBSUB_ENDPOINT:-opc.udp://127.0.0.1:4840}
|
|
PUBLISH_INTERVAL_MS: ${PUBLISH_INTERVAL_MS:-1000}
|
|
|
|
x-subscriber-env: &subscriber-env
|
|
ROLE: subscriber
|
|
HA_MODE: ${HA_MODE:-hot}
|
|
HA_ELECTION: leader-election
|
|
HA_RAFT_MEMBERS: "3"
|
|
HA_RAFT_BIND: tcp://0.0.0.0:6570
|
|
HA_INSECURE: ${HA_INSECURE:-true}
|
|
HA_RECORD_KEY: ${HA_RECORD_KEY:-}
|
|
PUBSUB_ENDPOINT: ${PUBSUB_ENDPOINT:-opc.udp://239.0.0.1:4840}
|
|
|
|
services:
|
|
publisher-a:
|
|
<<: *pubsub-image
|
|
profiles: ["strong"]
|
|
hostname: publisher-a
|
|
environment:
|
|
<<: *publisher-env
|
|
OWNER_ID: publisher-a
|
|
HA_RAFT_ID: "1"
|
|
HA_RAFT_PEERS: tcp://publisher-b:6560,tcp://publisher-c:6560
|
|
|
|
publisher-b:
|
|
<<: *pubsub-image
|
|
profiles: ["strong"]
|
|
hostname: publisher-b
|
|
environment:
|
|
<<: *publisher-env
|
|
OWNER_ID: publisher-b
|
|
HA_RAFT_ID: "2"
|
|
HA_RAFT_PEERS: tcp://publisher-a:6560,tcp://publisher-c:6560
|
|
|
|
publisher-c:
|
|
<<: *pubsub-image
|
|
profiles: ["strong"]
|
|
hostname: publisher-c
|
|
environment:
|
|
<<: *publisher-env
|
|
OWNER_ID: publisher-c
|
|
HA_RAFT_ID: "3"
|
|
HA_RAFT_PEERS: tcp://publisher-a:6560,tcp://publisher-b:6560
|
|
|
|
subscriber-a:
|
|
<<: *pubsub-image
|
|
profiles: ["strong"]
|
|
hostname: subscriber-a
|
|
environment:
|
|
<<: *subscriber-env
|
|
OWNER_ID: subscriber-a
|
|
HA_RAFT_ID: "1"
|
|
HA_RAFT_PEERS: tcp://subscriber-b:6570,tcp://subscriber-c:6570
|
|
|
|
subscriber-b:
|
|
<<: *pubsub-image
|
|
profiles: ["strong"]
|
|
hostname: subscriber-b
|
|
environment:
|
|
<<: *subscriber-env
|
|
OWNER_ID: subscriber-b
|
|
HA_RAFT_ID: "2"
|
|
HA_RAFT_PEERS: tcp://subscriber-a:6570,tcp://subscriber-c:6570
|
|
|
|
subscriber-c:
|
|
<<: *pubsub-image
|
|
profiles: ["strong"]
|
|
hostname: subscriber-c
|
|
environment:
|
|
<<: *subscriber-env
|
|
OWNER_ID: subscriber-c
|
|
HA_RAFT_ID: "3"
|
|
HA_RAFT_PEERS: tcp://subscriber-a:6570,tcp://subscriber-b:6570
|
|
|
|
demo:
|
|
<<: *pubsub-image
|
|
profiles: ["demo"]
|
|
environment:
|
|
ROLE: demo
|
|
HA_MODE: ${HA_MODE:-hot}
|
|
PUBSUB_ENDPOINT: ${PUBSUB_ENDPOINT:-opc.udp://239.0.0.1:4840}
|
|
DEMO_FIRST_SECONDS: ${DEMO_FIRST_SECONDS:-6}
|
|
DEMO_SECOND_SECONDS: ${DEMO_SECOND_SECONDS:-6}
|