dohertj2/ScadaBridge
1
0
Fork 0
Code Issues 2 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

R2-02: Communication & Store-and-Forward round-2 fixes incl. Critical N1 (15 tasks) #9

Closed
dohertj2 wants to merge 0 commits from r2-plan02 into main
pull from: r2-plan02
merge into: dohertj2:main
Conversation 1 Commits - Files Changed -
dohertj2 commented 2026-07-13 10:28:55 -04:00
Owner
Copy Link
Copy Source

Round-2 architecture-review fixes — PLAN-R2-02 (Communication & Store-and-Forward), all 15 tasks incl. the round-2 Critical (N1). Source: archreview/02-communication-store-and-forward.md.

TDD throughout; per-task pathspec commits; full slnx build 0/0; targeted suites green (full-suite sweep at integration merge).

Critical N1 + High N2 spine (T1–T7):

  • T1 91209070 shared oldest-Up ActiveNodeEvaluator in Communication; Host evaluator delegates
  • T2 6e0fa213 failing two-node repro — leader-vs-oldest resync divergence wipes delivering node buffer
  • T3 3a5b885a resync authority uses the shared oldest-Up predicate + delivery-gate delegate; apply-time re-check
  • T4 26dce8b6 heartbeat IsActive uses the shared predicate; Host wires one delegate everywhere
  • T5 3f937b39 chunk the resync snapshot to fit Akka remoting frames (additive byte-budgeted protocol)
  • T6 84bc2380 standby assembles chunked resync, applies atomically, acks; N5 race documented
  • T7 6e1ab62d resync ack confirmation + completed/ack-missing telemetry

Wave-1 remainder (T8–T15):

  • T8 61442b5f _sweepTask CAS-win publish (shutdown drain no longer clobbered) (N3)
  • T9 cc4ff702 eager-validate SweepBatchLimit/SweepTargetParallelism (N4)
  • T10 bb8be553 coalesce live-alarm publishes (N6)
  • T11 c29e5889 queued re-seed + stream-generation stamp (N7)
  • T12 b7f8632d ctor-inject reconnect/stability, remove process-global statics (N7)
  • T13 4e228110 RemoveSiteAsync production caller on site delete (N8)
  • T14 41ffe42d doc acceptance for standby/deleted-site aggregator (N8)
  • T15 c83b51fe single-endpoint sites can go live (N9)

Additive wire messages (SfBufferSnapshotChunk/SfBufferResyncAck, intra-site remoting; legacy SfBufferSnapshot retained for rolling compat). R2-01 and R2-07 stack on this branch (shared AkkaHostedService.cs/TwoNodeClusterFixture.cs/ManagementActor.cs/SiteAlarmLiveCacheService.cs).

Round-2 architecture-review fixes — **PLAN-R2-02 (Communication & Store-and-Forward)**, all 15 tasks incl. the round-2 **Critical (N1)**. Source: `archreview/02-communication-store-and-forward.md`. TDD throughout; per-task pathspec commits; full slnx **build 0/0**; targeted suites green (full-suite sweep at integration merge). **Critical N1 + High N2 spine (T1–T7):** - **T1** `91209070` shared oldest-Up `ActiveNodeEvaluator` in Communication; Host evaluator delegates - **T2** `6e0fa213` failing two-node repro — leader-vs-oldest resync divergence wipes delivering node buffer - **T3** `3a5b885a` resync authority uses the shared oldest-Up predicate + delivery-gate delegate; apply-time re-check - **T4** `26dce8b6` heartbeat IsActive uses the shared predicate; Host wires one delegate everywhere - **T5** `3f937b39` chunk the resync snapshot to fit Akka remoting frames (additive byte-budgeted protocol) - **T6** `84bc2380` standby assembles chunked resync, applies atomically, acks; N5 race documented - **T7** `6e1ab62d` resync ack confirmation + completed/ack-missing telemetry **Wave-1 remainder (T8–T15):** - **T8** `61442b5f` `_sweepTask` CAS-win publish (shutdown drain no longer clobbered) (N3) - **T9** `cc4ff702` eager-validate SweepBatchLimit/SweepTargetParallelism (N4) - **T10** `bb8be553` coalesce live-alarm publishes (N6) - **T11** `c29e5889` queued re-seed + stream-generation stamp (N7) - **T12** `b7f8632d` ctor-inject reconnect/stability, remove process-global statics (N7) - **T13** `4e228110` RemoveSiteAsync production caller on site delete (N8) - **T14** `41ffe42d` doc acceptance for standby/deleted-site aggregator (N8) - **T15** `c83b51fe` single-endpoint sites can go live (N9) Additive wire messages (`SfBufferSnapshotChunk`/`SfBufferResyncAck`, intra-site remoting; legacy `SfBufferSnapshot` retained for rolling compat). **R2-01 and R2-07 stack on this branch** (shared `AkkaHostedService.cs`/`TwoNodeClusterFixture.cs`/`ManagementActor.cs`/`SiteAlarmLiveCacheService.cs`).
dohertj2 added 15 commits 2026-07-13 10:28:56 -04:00
fix(comm): shared oldest-Up ActiveNodeEvaluator in Communication; Host evaluator delegates (plan R2-02 T1) 91209070d0
test(saf): failing two-node repro — leader-vs-oldest resync divergence wipes delivering node buffer (plan R2-02 T2) 6e0fa21307
fix(saf): resync authority uses the shared oldest-Up predicate + delivery-gate delegate; apply-time re-check guard (plan R2-02 T3) 3a5b885a44
fix(comm): heartbeat IsActive uses the shared oldest-Up predicate; Host wires one delegate everywhere (plan R2-02 T4) 26dce8b69f
fix(saf): chunk the resync snapshot to fit Akka remoting frames (additive protocol, byte-budgeted) (plan R2-02 T5) 3f937b399b
fix(saf): standby assembles chunked resync, applies atomically with re-check, acks; N5 race documented (plan R2-02 T6) 84bc2380f3
feat(saf): resync ack confirmation + completed/ack-missing telemetry; doc resync rewrite (plan R2-02 T7) 6e1ab62d27
fix(saf): publish _sweepTask only on CAS win so StopAsync drains the real in-flight sweep (plan R2-02 T8) 61442b5f81
chore(saf): eagerly validate SweepBatchLimit/SweepTargetParallelism (plan R2-02 T9) cc4ff7029d
perf(comm): coalesce live-alarm delta publishes (250ms window, 0 = legacy) (plan R2-02 T10) bb8be55382
fix(comm): queue failover re-seed behind in-flight fan-out; stamp stream generation on gRPC errors (plan R2-02 T11) c29e588905
chore(comm): ctor-inject aggregator reconnect/stability tuning, remove process-global statics (plan R2-02 T12) b7f8632db8
fix(comm): site delete disposes the site's cached gRPC channels via RemoveSiteAsync (plan R2-02 T13) 4e228110ec
docs(comm): accept + document standby aggregators and deleted-site viewer behavior; fix aggregator e2e ctor call for new params (plan R2-02 T14) 41ffe42de3
fix(comm): single-gRPC-endpoint sites can go live (flip degenerates to same-node reconnect) (plan R2-02 T15) c83b51fe9c
dohertj2 commented 2026-07-13 11:48:36 -04:00
Author
Owner
Copy Link
Copy Source

Merged to main via the r2-integration fast-forward (main @ 1930f19b, pushed to origin). All commits from this branch are in main; the two integration-surfaced test fixes (IntegrationTests NodeName host-boot config, compile-cache assertion relax) landed on main as well. Closing — content fully integrated.

Merged to main via the r2-integration fast-forward (main @ 1930f19b, pushed to origin). All commits from this branch are in main; the two integration-surfaced test fixes (IntegrationTests NodeName host-boot config, compile-cache assertion relax) landed on main as well. Closing — content fully integrated.
dohertj2 closed this pull request 2026-07-13 11:48:37 -04:00

Pull request closed

This pull request cannot be reopened because the branch was deleted.
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
dohertj2 (dohertj2)
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: dohertj2/ScadaBridge#9
Delete Branch "r2-plan02"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?