Repository navigation
Commit 477508e
committed
fix(daemon): fold #3199's record-stop retry into the liveness-gated hint
Rebase resolution against main@294dc7d (#3199), which rewrote the same hint
formatter this PR restructures. Both changes are semantic and both survive
here:
- #3199 made `record` a preserve-daemon policy and generalized the
keep-exporting retry to LOCAL timeouts, because a preserved daemon may
still be exporting (and a stop queued for the device lock is dropped
before any export starts, hence "may"). This PR's shape decides
"preserved" from the probe verdict + declared policy instead of the old
sweep/reset booleans, so the retry branch keys on `!resetDaemon` and
`action === 'stop'` BEFORE the remote split, with the remote wording
merely adding "remote ". The old remote-only "is still exporting" claim
becomes the shared "may still be exporting" one at #3199's second commit.
- The reset branch stays this PR's: a daemon the probe proved unresponsive
was SIGKILLed, is no longer exporting, and gets the probe-verdict wording
with no keep-exporting promise — the exact case #3199's note about a
mid-export reset predates, where the probe now makes the reset rarer.
Route coverage gains a local `record stop` row: the positional rides the
real transport context into the hint, the preserve policy must skip the
probe entirely (connections: 1), and no sweep call may fire — #3199's
runner-survival requirement, which this PR satisfies by removing the sweep
for every command instead of excluding `record` by name.1 parent 46b30e8 commit 477508e
3 files changed
Lines changed: 53 additions & 15 deletions
File tree
- src/daemon-client
- __tests__
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
118 | 118 | | |
119 | 119 | | |
120 | 120 | | |
121 | | - | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
122 | 126 | | |
123 | 127 | | |
124 | 128 | | |
125 | 129 | | |
126 | | - | |
| 130 | + | |
127 | 131 | | |
128 | 132 | | |
129 | 133 | | |
| |||
229 | 233 | | |
230 | 234 | | |
231 | 235 | | |
| 236 | + | |
232 | 237 | | |
233 | 238 | | |
234 | 239 | | |
| |||
285 | 290 | | |
286 | 291 | | |
287 | 292 | | |
| 293 | + | |
| 294 | + | |
| 295 | + | |
| 296 | + | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
| 302 | + | |
| 303 | + | |
| 304 | + | |
| 305 | + | |
| 306 | + | |
| 307 | + | |
| 308 | + | |
288 | 309 | | |
289 | 310 | | |
290 | 311 | | |
| |||
339 | 360 | | |
340 | 361 | | |
341 | 362 | | |
342 | | - | |
| 363 | + | |
343 | 364 | | |
344 | 365 | | |
345 | 366 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
68 | 68 | | |
69 | 69 | | |
70 | 70 | | |
71 | | - | |
| 71 | + | |
| 72 | + | |
72 | 73 | | |
73 | 74 | | |
74 | 75 | | |
| |||
78 | 79 | | |
79 | 80 | | |
80 | 81 | | |
81 | | - | |
| 82 | + | |
82 | 83 | | |
83 | 84 | | |
84 | 85 | | |
| |||
88 | 89 | | |
89 | 90 | | |
90 | 91 | | |
91 | | - | |
| 92 | + | |
92 | 93 | | |
93 | | - | |
94 | | - | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
95 | 109 | | |
96 | 110 | | |
97 | 111 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
133 | 133 | | |
134 | 134 | | |
135 | 135 | | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
136 | 146 | | |
137 | | - | |
138 | | - | |
139 | | - | |
140 | | - | |
141 | | - | |
142 | | - | |
143 | | - | |
144 | 147 | | |
145 | 148 | | |
146 | 149 | | |
| |||
0 commit comments