Repository navigation
Commit c1b051b
committed
fix(checkpoints): sync journal markers before rename, guard and merge marker entries
The two marker writers staged a file with fs.writeFile and renamed it without ever
syncing it, so a crash could leave the marker name in place over content that never
reached it. Both writers now take a write-mode handle on the staging file, write the
whole payload, sync once, close, rename, and then sync the containing directory best
effort - the order appendChange already uses for the journal itself. On this Windows
box that directory sync opens with "r" and lands in appendChange's own EPERM
tolerance list, so it degrades to a warning there; the content sync is what carries
the guarantee, and the directory part is no stronger than the journal path's.
reconcilePendingJournal read entry.path straight off marker.entries. A marker that
parses can still carry a null or a half-shaped element, and the TypeError escaped
loadChanges with the marker left in place: every later write-bearing checkpoint save
then failed on the same corruption. The fold now runs entries through the same
isChangeJournalEntry guard the incomplete fold at the sibling reconciler already uses.
writeIncompleteJournal renamed over whatever marker was already on disk, so a second
failed ready-promotion dropped the first batch of an already-committed checkpoint. It
now unions with the entries the marker carries under the same
path\0operation\0checkpointId key, preserving first-seen order: the earlier marker's
entries keep their positions, the new batch is appended after them, and a repeated key
is stored once.
ApplyPatchTool recorded a move's destination write only after the source unlink and
its error report, so a rejected task.say stranded a write that was already on disk and
left the catch-path flush with nothing to record. The record now happens right after
the destination write, before the unlink attempt and before bookkeeping. The index.ts
comment that called the pre-commit 'awaiting' marker the recovery record for the next
read is corrected: it carries no entries and reconcilePendingJournal clears it, so
that branch cannot fall back on it.
Tests first, each red against the pre-fix code and green after it, with the
implementation reverted to its HEAD blob and restored from a recorded blob sha:
reconcile with [valid, null, half-shaped] appends the valid entry and still clears the
marker (was TypeError: Cannot read properties of null (reading 'path')); staged
content synced before the rename and the directory after it, for both marker writers
(was "expected [] to have a length of 1 but got +0"); a second incomplete write keeps
the first batch (was "expected ['first'] to deeply equal ['first', 'second']"); a move
whose unlink and error report both reject still journals the destination (was
"expected \"vi.fn()\" to be called once, but got 0 times"). Two further cases
characterise behaviour this commit deliberately does not change: the next read discards
an awaiting marker left behind by a host exit between commit and promotion, and
checkpointSave resolves undefined when the pre-commit marker write fails so the tool
catch path reports only its own error.
Counts from this same git diff --cached --numstat run: +110/-21 changeJournal.ts, +7/-4 index.ts, +8/-5 ApplyPatchTool.ts, +157/-1 changeJournal.spec.ts, +29/-0 checkpointJournal.test.ts, +51/-0 checkpointJournalPromotion.test.ts, +33/-0 applyPatchTool.execute.spec.ts.1 parent e12e961 commit c1b051b
7 files changed
Lines changed: 395 additions & 31 deletions
File tree
- src/core
- checkpoints
- __tests__
- tools
- __tests__
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
8 | 17 | | |
9 | 18 | | |
10 | 19 | | |
| |||
186 | 195 | | |
187 | 196 | | |
188 | 197 | | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
| 279 | + | |
| 280 | + | |
| 281 | + | |
| 282 | + | |
| 283 | + | |
| 284 | + | |
| 285 | + | |
| 286 | + | |
| 287 | + | |
| 288 | + | |
| 289 | + | |
| 290 | + | |
| 291 | + | |
| 292 | + | |
| 293 | + | |
| 294 | + | |
| 295 | + | |
| 296 | + | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
| 302 | + | |
| 303 | + | |
| 304 | + | |
| 305 | + | |
| 306 | + | |
| 307 | + | |
| 308 | + | |
| 309 | + | |
| 310 | + | |
| 311 | + | |
| 312 | + | |
| 313 | + | |
| 314 | + | |
| 315 | + | |
| 316 | + | |
| 317 | + | |
| 318 | + | |
| 319 | + | |
| 320 | + | |
| 321 | + | |
| 322 | + | |
| 323 | + | |
| 324 | + | |
| 325 | + | |
| 326 | + | |
| 327 | + | |
| 328 | + | |
| 329 | + | |
| 330 | + | |
| 331 | + | |
| 332 | + | |
| 333 | + | |
| 334 | + | |
| 335 | + | |
| 336 | + | |
| 337 | + | |
| 338 | + | |
| 339 | + | |
| 340 | + | |
| 341 | + | |
| 342 | + | |
| 343 | + | |
| 344 | + | |
189 | 345 | | |
190 | 346 | | |
191 | 347 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
271 | 271 | | |
272 | 272 | | |
273 | 273 | | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
| 279 | + | |
| 280 | + | |
| 281 | + | |
| 282 | + | |
| 283 | + | |
| 284 | + | |
| 285 | + | |
| 286 | + | |
| 287 | + | |
| 288 | + | |
| 289 | + | |
| 290 | + | |
| 291 | + | |
| 292 | + | |
| 293 | + | |
| 294 | + | |
| 295 | + | |
| 296 | + | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
| 302 | + | |
274 | 303 | | |
275 | 304 | | |
276 | 305 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
43 | 43 | | |
44 | 44 | | |
45 | 45 | | |
| 46 | + | |
46 | 47 | | |
47 | 48 | | |
48 | 49 | | |
49 | 50 | | |
50 | 51 | | |
51 | 52 | | |
| 53 | + | |
52 | 54 | | |
53 | 55 | | |
54 | 56 | | |
| |||
58 | 60 | | |
59 | 61 | | |
60 | 62 | | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
61 | 66 | | |
62 | 67 | | |
63 | 68 | | |
| |||
100 | 105 | | |
101 | 106 | | |
102 | 107 | | |
| 108 | + | |
103 | 109 | | |
104 | 110 | | |
105 | 111 | | |
| |||
190 | 196 | | |
191 | 197 | | |
192 | 198 | | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
193 | 244 | | |
0 commit comments