Commit 5f8bf79
authored
fix: stop accumulating WhenAny continuations on the Conditions aggregate (#562)
The FDv2 data system's `Conditions::GetFuture()` previously returned the
same shared future to every iteration of `RunSynchronizerNext`, so each
iteration's `WhenAny(cond_future, next_future).Then(...)` appended a
callback to the shared future's `continuations_` vector. On a healthy
primary streaming changesets without ever firing fallback/recovery,
those continuations accumulated for the synchronizer's lifetime.
- `Conditions::GetFuture(token)` now returns a fresh Future per call.
- The caller cancels its `CancellationSource` after the WhenAny
resolves.
- The cancellation callback erases the per-call Promise from a pending
list inside `Conditions`.
- A single permanent listener on the underlying aggregate drains the
pending list and resolves each Promise when any condition fires.
Analogous to launchdarkly/java-core#163.
<!-- CURSOR_SUMMARY -->
---
> [!NOTE]
> **Medium Risk**
> Touches FDv2 orchestration and async cancellation ordering (locks
around `CancellationCallback`); behavior change is localized but
long-running streaming paths depend on correct cleanup.
>
> **Overview**
> Fixes unbounded growth of `WhenAny` continuation callbacks during
long-lived primary streaming, where each `RunSynchronizerNext` loop
reused one shared `Conditions` future.
>
> **`Conditions::GetFuture`** now takes a `CancellationToken` and
returns a **new** future per call. A single internal aggregate listener
still watches the first condition to fire; when it resolves, it fans out
to all pending per-call promises. **`Close`** also drains any
still-pending waiters with `kCancelled`.
>
> Callers (notably **`FDv2DataSystem::RunSynchronizerNext`**) create a
per-iteration `CancellationSource`, pass its token into `GetFuture`, and
**cancel after `WhenAny` completes** so the pending entry and its
promise/continuations can be dropped. Token cancellation removes the
waiter from the pending list if the race finishes early.
>
> Tests updated to pass a `CancellationToken` into `GetFuture`.
>
> <sup>Reviewed by [Cursor Bugbot](https://cursor.com/bugbot) for commit
af09001. Bugbot is set up for automated
code reviews on this repo. Configure
[here](https://www.cursor.com/dashboard/bugbot).</sup>
<!-- /CURSOR_SUMMARY -->1 parent 85afca7 commit 5f8bf79
4 files changed
Lines changed: 119 additions & 14 deletions
File tree
- libs/server-sdk
- src/data_systems/fdv2
- tests
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| 5 | + | |
5 | 6 | | |
6 | 7 | | |
7 | 8 | | |
| |||
133 | 134 | | |
134 | 135 | | |
135 | 136 | | |
136 | | - | |
137 | | - | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
138 | 159 | | |
139 | 160 | | |
140 | 161 | | |
141 | 162 | | |
142 | 163 | | |
143 | | - | |
144 | | - | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
145 | 212 | | |
146 | 213 | | |
147 | 214 | | |
| |||
154 | 221 | | |
155 | 222 | | |
156 | 223 | | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
157 | 236 | | |
158 | 237 | | |
159 | 238 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| 11 | + | |
11 | 12 | | |
12 | 13 | | |
13 | 14 | | |
| 15 | + | |
14 | 16 | | |
15 | 17 | | |
16 | 18 | | |
| |||
136 | 138 | | |
137 | 139 | | |
138 | 140 | | |
139 | | - | |
| 141 | + | |
140 | 142 | | |
141 | 143 | | |
142 | 144 | | |
| |||
153 | 155 | | |
154 | 156 | | |
155 | 157 | | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
156 | 164 | | |
157 | | - | |
| 165 | + | |
158 | 166 | | |
159 | 167 | | |
160 | 168 | | |
161 | 169 | | |
162 | 170 | | |
163 | 171 | | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
164 | 185 | | |
165 | | - | |
| 186 | + | |
166 | 187 | | |
167 | 188 | | |
168 | 189 | | |
Lines changed: 5 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
274 | 274 | | |
275 | 275 | | |
276 | 276 | | |
277 | | - | |
| 277 | + | |
| 278 | + | |
278 | 279 | | |
279 | 280 | | |
280 | | - | |
281 | | - | |
| 281 | + | |
| 282 | + | |
| 283 | + | |
282 | 284 | | |
283 | 285 | | |
284 | 286 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
| 15 | + | |
| 16 | + | |
15 | 17 | | |
16 | 18 | | |
17 | 19 | | |
| |||
162 | 164 | | |
163 | 165 | | |
164 | 166 | | |
165 | | - | |
| 167 | + | |
166 | 168 | | |
167 | 169 | | |
168 | 170 | | |
| |||
178 | 180 | | |
179 | 181 | | |
180 | 182 | | |
181 | | - | |
| 183 | + | |
182 | 184 | | |
183 | 185 | | |
184 | 186 | | |
| |||
202 | 204 | | |
203 | 205 | | |
204 | 206 | | |
205 | | - | |
| 207 | + | |
206 | 208 | | |
207 | 209 | | |
208 | 210 | | |
| |||
220 | 222 | | |
221 | 223 | | |
222 | 224 | | |
223 | | - | |
| 225 | + | |
| 226 | + | |
224 | 227 | | |
225 | 228 | | |
226 | 229 | | |
0 commit comments