Repository navigation
Commit 0ef04e6
authored
fix(cli): stop start shadowing a live configured-port proxy, and retry health (#3106)
Reimplements #3078 (author @Veritas-7) on dev. Both production hunks are
right; the PR targets main and its test file does not typecheck
(tests/cli-health-retry.test.ts declares const servers: Server[] while
importing only IncomingMessage and ServerResponse).
handleStart skipped the configured-port probe whenever the pid file and the
runtime-port record were both absent. That absence proves nothing: a
fallback-port sibling overwrites both records when it starts and removes them
when it stops. So start shadowed a healthy configured-port proxy with an
ephemeral-port copy, re-pointed client config at the copy, and the next
sibling shutdown left no runtime record for discovery at all. handleEnsure
already passed probeConfiguredPort: true; handleStart is the path that did not.
ocx health probed once. A proxy that has only just bound can miss a single
probe while its event loop is still settling startup work, so health run
seconds after a service restart reported "Proxy not healthy" and exited 1 for
a proxy that was serving. The stop paths already retry this exact race under
SERVICE_STOP_LIVENESS (#764).
Tests are dependency-injected and source-level rather than #3078's
port-binding integration fixture: the retry budget is asserted through
dispatchCommand's injected findLiveProxy, and the start guard through a source
oracle next to the handleEnsure call site that was already correct.
Mutation-checked, both restored:
drop probeConfiguredPort from handleStart -> 28 pass / 1 fail, the start guard
drop the health retry budget -> 28 pass / 1 fail, the health test1 parent a3656a9 commit 0ef04e6
3 files changed
Lines changed: 85 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
| 15 | + | |
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
| |||
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
32 | | - | |
| 32 | + | |
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
| |||
573 | 573 | | |
574 | 574 | | |
575 | 575 | | |
576 | | - | |
| 576 | + | |
| 577 | + | |
| 578 | + | |
| 579 | + | |
| 580 | + | |
| 581 | + | |
577 | 582 | | |
578 | 583 | | |
579 | 584 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
240 | 240 | | |
241 | 241 | | |
242 | 242 | | |
243 | | - | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
244 | 251 | | |
245 | 252 | | |
246 | 253 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
123 | 123 | | |
124 | 124 | | |
125 | 125 | | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 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 | + | |
126 | 195 | | |
127 | 196 | | |
128 | 197 | | |
| |||
0 commit comments