Repository navigation
Commit 91be046
committed
core: always send PFCP responses; absorb absent datapath entries in mapOperations
Handle() returned early when a handler reported an error and silently
dropped the response message the handler had built. The visible case: a
Session Deletion Response was never transmitted when the datapath cleanup
hit "delete: key does not exist" (measured rx=21 vs tx=8 within one
workload), so the CP function (open5gs SMF) saw no response and timed out
its PFCP transaction — on some open5gs versions that aborts the whole SMF
process (open5gs/open5gs#4833).
Changes:
- Handle(): always transmit the handler's response when non-nil; a send
error is logged and only propagated when the handler succeeded.
- mapOperations (cmd/ebpf): delete operations now treat "key absent"
(ebpf.ErrKeyNotExist / ENOENT) as success via isKeyAbsent(), so calling
code does not have to care about this error — the desired end state of a
delete is that the entry is absent. This uniformly covers every delete
call site, including HandlePfcpSessionModificationRequest.
- DeleteUrr() is split: ReadUrr() explicitly returns the URR usage data,
and DeleteUrr() follows the conventional error-only signature.
Verified with a patched build on a session-churn workload: all deletion
requests answered (rx=7/tx=7, RequestAccepted), and no "Error handling
PFCP" warnings in the log.
Fixes edgecomllc#647
Signed-off-by: frank <[email protected]>1 parent 6f3c030 commit 91be046
4 files changed
Lines changed: 67 additions & 21 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
69 | 69 | | |
70 | 70 | | |
71 | 71 | | |
72 | | - | |
| 72 | + | |
73 | 73 | | |
74 | 74 | | |
75 | 75 | | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
76 | 80 | | |
77 | 81 | | |
78 | 82 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
33 | 32 | | |
34 | 33 | | |
35 | 34 | | |
36 | 35 | | |
| 36 | + | |
| 37 | + | |
37 | 38 | | |
38 | 39 | | |
39 | | - | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
40 | 46 | | |
41 | | - | |
| 47 | + | |
42 | 48 | | |
43 | 49 | | |
44 | 50 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
184 | 184 | | |
185 | 185 | | |
186 | 186 | | |
187 | | - | |
| 187 | + | |
188 | 188 | | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
189 | 193 | | |
190 | 194 | | |
191 | 195 | | |
| |||
387 | 391 | | |
388 | 392 | | |
389 | 393 | | |
390 | | - | |
| 394 | + | |
391 | 395 | | |
| 396 | + | |
| 397 | + | |
| 398 | + | |
| 399 | + | |
392 | 400 | | |
393 | 401 | | |
394 | 402 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| 6 | + | |
6 | 7 | | |
7 | 8 | | |
| 9 | + | |
8 | 10 | | |
9 | 11 | | |
10 | 12 | | |
| |||
14 | 16 | | |
15 | 17 | | |
16 | 18 | | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
17 | 26 | | |
18 | 27 | | |
19 | 28 | | |
| |||
109 | 118 | | |
110 | 119 | | |
111 | 120 | | |
112 | | - | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
113 | 125 | | |
114 | 126 | | |
115 | 127 | | |
116 | 128 | | |
117 | | - | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
118 | 133 | | |
119 | 134 | | |
120 | 135 | | |
| |||
147 | 162 | | |
148 | 163 | | |
149 | 164 | | |
150 | | - | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
151 | 169 | | |
152 | 170 | | |
153 | 171 | | |
| |||
188 | 206 | | |
189 | 207 | | |
190 | 208 | | |
191 | | - | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
192 | 213 | | |
193 | 214 | | |
194 | 215 | | |
| |||
218 | 239 | | |
219 | 240 | | |
220 | 241 | | |
221 | | - | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
222 | 246 | | |
223 | 247 | | |
224 | 248 | | |
| |||
241 | 265 | | |
242 | 266 | | |
243 | 267 | | |
244 | | - | |
245 | | - | |
| 268 | + | |
246 | 269 | | |
247 | 270 | | |
248 | 271 | | |
249 | 272 | | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
250 | 278 | | |
251 | | - | |
252 | | - | |
| 279 | + | |
| 280 | + | |
253 | 281 | | |
254 | | - | |
255 | | - | |
| 282 | + | |
256 | 283 | | |
257 | 284 | | |
258 | 285 | | |
| |||
273 | 300 | | |
274 | 301 | | |
275 | 302 | | |
276 | | - | |
| 303 | + | |
| 304 | + | |
277 | 305 | | |
278 | 306 | | |
279 | 307 | | |
| |||
0 commit comments