Repository navigation
Commit e45d408
chore(buzz-acp): merge boot-recovery ledger infrastructure onto origin/main
Integrates the full boot-recovery/ledger subsystem (a17863c) onto
origin/main (daf1f40). Semantic conflict resolution:
lib.rs: kept origin/main's handle_prompt_result with the new
TimeoutKind::Hard { recently_active: bool } split (#2175). Updated
classify_and_complete_batch (the shutdown-drain seam) to handle both
recently_active variants with matching retry/dead-letter semantics.
Updated three BatchEvent initializers in #2175 tests to include the
four admission/recovery fields added by our boot-recovery work.
queue.rs: took both sides — origin/main's extend_in_flight_deadline
and its tests (#2175 steer renewal) + our set_next_admission_seq,
recoverable_triggers, take_dirty_channels, and their tests. Made
requeue/requeue_as_cancelled pub to match origin/main (handle_prompt_
result calls them directly in the main loop; classify_and_complete_
batch calls them via complete_batch — both usages are valid).
Co-authored-by: Will Pfleger <[email protected]>
Signed-off-by: Will Pfleger <[email protected]>8 files changed
Lines changed: 3711 additions & 199 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
79 | 79 | | |
80 | 80 | | |
81 | 81 | | |
| 82 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
418 | 418 | | |
419 | 419 | | |
420 | 420 | | |
| 421 | + | |
| 422 | + | |
| 423 | + | |
| 424 | + | |
| 425 | + | |
| 426 | + | |
| 427 | + | |
| 428 | + | |
| 429 | + | |
| 430 | + | |
| 431 | + | |
| 432 | + | |
| 433 | + | |
| 434 | + | |
| 435 | + | |
| 436 | + | |
421 | 437 | | |
422 | 438 | | |
423 | 439 | | |
| |||
546 | 562 | | |
547 | 563 | | |
548 | 564 | | |
| 565 | + | |
| 566 | + | |
| 567 | + | |
| 568 | + | |
| 569 | + | |
| 570 | + | |
| 571 | + | |
| 572 | + | |
549 | 573 | | |
550 | 574 | | |
551 | 575 | | |
| |||
996 | 1020 | | |
997 | 1021 | | |
998 | 1022 | | |
| 1023 | + | |
| 1024 | + | |
| 1025 | + | |
999 | 1026 | | |
1000 | 1027 | | |
1001 | 1028 | | |
| |||
1017 | 1044 | | |
1018 | 1045 | | |
1019 | 1046 | | |
1020 | | - | |
| 1047 | + | |
1021 | 1048 | | |
1022 | 1049 | | |
1023 | 1050 | | |
| |||
1038 | 1065 | | |
1039 | 1066 | | |
1040 | 1067 | | |
| 1068 | + | |
| 1069 | + | |
1041 | 1070 | | |
1042 | 1071 | | |
1043 | 1072 | | |
| |||
1364 | 1393 | | |
1365 | 1394 | | |
1366 | 1395 | | |
| 1396 | + | |
| 1397 | + | |
| 1398 | + | |
1367 | 1399 | | |
1368 | 1400 | | |
1369 | 1401 | | |
| |||
0 commit comments