Commit 0e64f2d
committed
[mcast] audit-pass + reconciler updates + opte hardening + config tuning
Final, pre-review pass on this work. It stacks atop #10070 and inherits
the multicast-to-physical (M2P) underlay forwarding and VMM-keyed instance
subscription endpoints.
This also builds on and integrates #10381.
Above these foundations, this work includes the final pass on mgd-ddmd
integration:
* Reconciler correctness:
* `set_mcast_m2p` rolls back the xde M2P entry on per-NIC join
failure, so the reconciler converges on a retry instead of
leaving stale state pointing at the wrong underlay address.
* `propolis_id` is threaded end-to-end through the sled-agent
multicast endpoints to deal with live migration ambiguity.
* MRIB advertisement is gated on a flag rather than running unconditionally
after the DPD match arm, so that a DPD failure no longer leaves
a route advertised via DDM with no programmed forwarding state.
* OPTE hardening (illumos-utils):
* M2P entries upserted into a `BTreeMap<IpAddr, MulticastUnderlay>`
rather than a Vec on the non-illumos mock, eliminating duplicate-key corner
cases the production map already avoided.
* `MulticastFilterMap` encapsulates the per-NIC filter socket and
refcount state previously open-coded inside `PortManagerInner`,
concentrating the "join socket per underlay group per NIC"
invariant into one singular type.
* underlay_nics typed as &[AddrObject] rather than &[String].
* Per-NIC IPV6_JOIN_GROUP calls converted from libc::setsockopt to
nix::sys::socket::setsockopt for the typed bind.
* Sled-agent (real and sim):
* Sim v7 multicast endpoints fall through to the trait defaults
instead of overriding with just `unimplemented!()`, matching how
other versioned endpoints behave in the sim.
* Sim VMM existence check on join/leave restored.
* Configuration:
* `MulticastGroupReconcilerConfig` gains a group_concurrency_limit
and member_concurrency_limit bounding the per-pass fan-out of the RPW's
buffer_unordered streams.
* Test infra:
* `populate_ddm_peers` no longer caches the peer map. The previous
cache was keyed by sled-id set, but the synthesized port names
embedded each sled's `sp_slot` from inventory, so cache reuse
within the same sled set could produce stale port mappings.
* Documentation cleanup across the RPW, sled-agent multicast paths, and the
new(er) sled-agent types module.1 parent 401cc43 commit 0e64f2d
36 files changed
Lines changed: 961 additions & 32746 deletions
File tree
- clients/ddm-admin-client/src
- illumos-utils/src/opte
- internal-dns/resolver/src
- nexus-config/src
- nexus
- src/app
- background
- tasks/multicast
- multicast
- test-utils/src
- tests/integration_tests/multicast
- types/src/internal_api
- openapi/nexus
- sled-agent
- src
- sim
- types/versions/src/mcast_m2p_forwarding
- test-utils/src/dev
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
6 | | - | |
7 | 5 | | |
8 | 6 | | |
9 | 7 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
76 | 76 | | |
77 | 77 | | |
78 | 78 | | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
79 | 85 | | |
80 | 86 | | |
81 | 87 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
48 | | - | |
| 48 | + | |
49 | 49 | | |
50 | 50 | | |
51 | 51 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
| 7 | + | |
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| |||
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
| 40 | + | |
40 | 41 | | |
41 | 42 | | |
42 | 43 | | |
| |||
94 | 95 | | |
95 | 96 | | |
96 | 97 | | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
97 | 104 | | |
98 | 105 | | |
99 | 106 | | |
| |||
198 | 205 | | |
199 | 206 | | |
200 | 207 | | |
201 | | - | |
| 208 | + | |
202 | 209 | | |
203 | 210 | | |
204 | | - | |
205 | | - | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
206 | 214 | | |
207 | 215 | | |
208 | 216 | | |
| |||
213 | 221 | | |
214 | 222 | | |
215 | 223 | | |
216 | | - | |
| 224 | + | |
217 | 225 | | |
218 | 226 | | |
219 | 227 | | |
| |||
391 | 399 | | |
392 | 400 | | |
393 | 401 | | |
394 | | - | |
395 | | - | |
396 | | - | |
| 402 | + | |
| 403 | + | |
397 | 404 | | |
398 | 405 | | |
399 | 406 | | |
| |||
403 | 410 | | |
404 | 411 | | |
405 | 412 | | |
406 | | - | |
| 413 | + | |
| 414 | + | |
| 415 | + | |
407 | 416 | | |
408 | 417 | | |
409 | 418 | | |
| |||
0 commit comments