mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-17 05:11:13 +08:00
d525bc3f28
# 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
49 lines
1.9 KiB
YAML
49 lines
1.9 KiB
YAML
# Active/active eventual consistency (CRDT gossip). The server scales to any replica count
|
|
# via DNS peer discovery; independent managed clients scale alongside it and each fail over
|
|
# transparently. Dynamic Raft (strong) scaling is not supported here.
|
|
#
|
|
# Run from the repository root. Scale the servers, and with the clients profile the clients too:
|
|
# docker compose -f samples/Redundancy/RedundantServer/Scale/docker-compose.yml up --build --scale server=5
|
|
# docker compose -f samples/Redundancy/RedundantServer/Scale/docker-compose.yml --profile clients up --build --scale server=3 --scale client=2
|
|
|
|
services:
|
|
server:
|
|
build:
|
|
context: ../../../..
|
|
dockerfile: samples/Redundancy/RedundantServer/Dockerfile
|
|
image: opcua-redundant-server
|
|
environment:
|
|
HA_MODE: aa
|
|
HA_CONSISTENCY: eventual
|
|
HA_PEER_DISCOVERY: dns
|
|
HA_SERVICE_NAME: server
|
|
HA_GOSSIP_PORT: "4840"
|
|
entrypoint:
|
|
- /bin/sh
|
|
- -c
|
|
- |
|
|
export HA_HOST="$$(hostname)"
|
|
export HA_NODE_ID="$${HA_NODE_ID:-$$(hostname)}"
|
|
exec dotnet RedundantServer.dll --port 62543
|
|
|
|
# Independent managed clients: each opts into WithServerRedundancy and fails over on its own,
|
|
# so this scales to any count with --scale client=N (no shared client store needed). A
|
|
# coordinated single-active client replica set instead uses AddRedundantClientSession + a
|
|
# Raft client store (fixed quorum); see docs/HighAvailability.md. Part of the "clients"
|
|
# profile so `up` without a profile runs the servers only.
|
|
client:
|
|
profiles: ["clients"]
|
|
build:
|
|
context: ../../../..
|
|
dockerfile: samples/Redundancy/RedundantClient/Dockerfile
|
|
image: opcua-redundant-client
|
|
depends_on:
|
|
- server
|
|
command:
|
|
- "--server"
|
|
- "opc.tcp://server:62543/RedundantServer"
|
|
- "--autoaccept"
|
|
- "--nosecurity"
|
|
- "--duration"
|
|
- "00:10:00"
|