Repository navigation
fix(udmd,nefd): the AMF leg lapses with its EE subscription, a shortened grant is reported, a lapsed DELETE is 404, the sweep is per AMF (#2149) - #2155
Conversation
…ned grant is reported, a lapsed DELETE is 404, the sweep is per AMF (#2149) R42 on #2144: - udmd's Namf_EventExposure subscription toward the AMF now carries the Nudm_EE subscription's granted expiry (`options.expiry`, TS 29.518 AmfEventMode). A refresh moves it by Namf modify (`replace /options/expiry`), so the AMF leg lapses with the subscription, even across a UDM restart. - A PATCH whose expiry the UDM shortened answers 200 with a TS 29.571 PatchResult (TS 29.503's UpdateEeSubscription 200 body). Its ReportItem is `/reportingOptions/expiry`, reason `granted <DateTime>`. nefd reads it as the confirmed expiry. - A DELETE of a lapsed subscription answers 404, as a modify does, and releases its AMF leg at once. - The expiry sweep releases legs per AMF, up to 8 AMFs at once. An AMF that fails one release has its other legs parked for the unsubscribe reconciler (the #2128 shape). Spec: specs/udmd-ee-expiry-followups-2149.md
Spec: specs/udmd-ee-expiry-followups-2149.md
R42 review: #2155 (head cb0e889, Closes #2149)Tested on cb0e889 merged with origin/main, and then with #2152's head (b4607e9) merged locally (not pushed). Merge order: needs Verified. Each revert below was a behavioural edit on the combined tree, run on its own; I restored each and the tree is clean.
Restart: the orphan is now bounded for every subscription that has an expiry. EE subscriptions are not persisted, so after a udmd restart the AMF leg lapses at the granted expiry, at most minor
VERDICT: APPROVE |
Spec: specs/udmd-ee-expiry-followups-2149.md # Conflicts: # src/bins/nextgcore-nefd/src/main.rs
Closes #2149.
These are R42's four follow-ups from the #2144 review (udmd EE subscriptions lapse at their granted expiry). This branch has main merged in, including #2123.
Verified against main (#2144 merged)
ee_amf::subscribe_bodysends nooptions, and a refreshed expiry never reaches the legee_grant_expirycaps the expiry and the modify answers 204is_expired; modify doesfor sub in &expired { release(sub).await }TS 29.503's UpdateEeSubscription answers 200 with a TS 29.571
PatchResult, or 204. PatchResult (report: [ReportItem {path, reason}]) is the only body the spec defines for a 200. So a shortened grant is reported as the ReportItem for/reportingOptions/expiry, withreason: "granted <DateTime>".Changes
subscribe_bodyaddsoptions: {trigger: CONTINUOUS, expiry}(AmfEventMode, wheretriggeris mandatory) when the subscription has an expiry, andAmfEeLeg.expiryrecords it. When a leg already fits at the serving AMF but its expiry differs, the reconcile sends Namf_EventExposure modifyreplace /options/expiryand keeps the same AMF subscription. If the AMF does not take it, or the expiry was removed (an option item cannot remove one), the leg is replaced by a fresh subscribe, as before.confirmed_expiryreads the PatchResult form, so a refreshing nefd records the real expiry.Acceptance vs evidence (each revert done on its own, restored, and checked with
diff)the_amf_leg_lapses_with_its_ee_subscription_2149, against the real amfd. The leg's AMF subscription expires at the granted time. A refresh moves it on the same AMF subscription, and there is no second oneoptions: fails at "the AMF leg lapses with it". Expiry change ignored by the reconcile: fails at the moved leg expiryan_ee_subscription_lapses_at_its_granted_expiry_2125, updated: a capped refresh answers 200 with exactly that PatchResult, and an uncapped one answers 204. nefda_udm_patch_result_reports_the_granted_expiry_2149the_expiry_sweep_releases_per_amf_in_parallel_2149: two blackholed AMFs with 2 legs each, and a healthy one with 1. The sweep takes less than 2 call timeouts, the healthy leg is deleted, and 4 legs are parkedGates (local)
cargo fmt --all --check, and clippy--all-targets -D warningsfor udmd and nefd.apply_ee_patch. Expect a small conflict there; whichever lands second resolves it.