tractor

Author SHA1 Message Date

Author	SHA1	Message	Date
Gud Boi	a722d535d9	Fix dropped `for/else` re-raise in masking CM `30e15925` ("Add `start_or_cancel()` to `trionics._taskc`") inserted `async def start_or_cancel()` — whose body opens its own col-4 `try:` — immediately before the trailing `else: raise`. Because the edit was a pure insertion (0 deletions), the same `else: raise` lines were silently REPARENTED: they used to be the `for exc_match in matching: ... else: raise` of `maybe_raise_from_masking_exc`, but now bind to `start_or_cancel`'s `try/except` where they're unreachable dead code. Net effect: `maybe_raise_from_masking_exc` lost the `for/else` re-raise of the un-masked exception, so a masked child cancellation gets swallowed instead of surfaced. - restore the `for/else: raise` to `maybe_raise_from_masking_exc` - drop the now-dead `else: raise` from `start_or_cancel` Surfaced as 2 deterministic failures in `test_sigint_closes_lifetime_stack[wait_for_ctx-bg_aio_task- send_SIGINT_to=child-*]` (the SIGINT-to-child "silent-abandon" regime). Bisected with `trio` held at `0.29.0`: clean at `9c36363b` (0/8), broken at `30e15925` (8/8), fixed (0/8). NOT a `trio` (0.29↔0.33 identical) nor logging-plugin regression. (this patch was generated in some part by [`claude-code`][claude-code-gh]) [claude-code-gh]: https://github.com/anthropics/claude-code (cherry picked from commit `325574cc07`) (cherry picked from commit `0b8033fdaa`)	2026-06-22 16:28:56 -04:00
Gud Boi	90466ec016	Add `start_or_cancel()` to `trionics._taskc` Wrapper around `trio.Nursery.start()` that DOESN'T mask out-of-band cancellation as a lossy startup failure. Picks the right re-raise: ambient `Cancelled` when present, the genuine startup-protocol `RuntimeError` otherwise. The problem, - `trio.Nursery.start()` raises a generic `RuntimeError("child exited without calling task_status.started()")` whenever the started task exits BEFORE calling `task_status.started()` — INCLUDING the common case where the child was cancelled out-of-band by an ancestor cancel-scope erroring/cancelling. - In that case the original `trio.Cancelled` is swallowed and the caller is left w/ an opaque, root-cause-detached `RuntimeError`. The fix, - Catch the "...started" RTE. - `await trio.lowlevel.checkpoint_if_cancelled()` — re-raises the in-flight `Cancelled` IFF we're under effective cancellation (ancestor-inclusive), carrying trio's auto-generated reason which points at the true root exc. - If we're NOT cancelled the `checkpoint_if_cancelled()` is a cheap no-op and we fall through to re-raise the genuine startup-protocol RTE. Re-export from `tractor.trionics` so callers don't have to reach into `_taskc`. (this patch was generated in some part by [`claude-code`][claude-code-gh]) [claude-code-gh]: https://github.com/anthropics/claude-code (cherry picked from commit `30e15925ba`) (cherry picked from commit `2b4589b1ee`)	2026-06-22 16:28:56 -04:00

Gud Boi

Fix dropped `for/else` re-raise in masking CM

`30e15925` ("Add `start_or_cancel()` to `trionics._taskc`")
inserted `async def start_or_cancel()` — whose body opens its
own col-4 `try:` — immediately before the trailing `else:
raise`. Because the edit was a pure insertion (0 deletions),
the *same* `else: raise` lines were silently REPARENTED: they
used to be the `for exc_match in matching: ... else: raise`
of `maybe_raise_from_masking_exc`, but now bind to
`start_or_cancel`'s `try/except` where they're unreachable
dead code.

Net effect: `maybe_raise_from_masking_exc` lost the `for/else`
re-raise of the un-masked exception, so a masked child
cancellation gets swallowed instead of surfaced.

- restore the `for/else: raise` to `maybe_raise_from_masking_exc`
- drop the now-dead `else: raise` from `start_or_cancel`

Surfaced as 2 deterministic failures in
`test_sigint_closes_lifetime_stack[wait_for_ctx-bg_aio_task-
send_SIGINT_to=child-*]` (the SIGINT-to-child "silent-abandon"
regime). Bisected with `trio` held at `0.29.0`: clean at
`9c36363b` (0/8), broken at `30e15925` (8/8), fixed (0/8).
NOT a `trio` (0.29↔0.33 identical) nor logging-plugin
regression.

(this patch was generated in some part by [`claude-code`][claude-code-gh])
[claude-code-gh]: https://github.com/anthropics/claude-code

(cherry picked from commit 325574cc07)
(cherry picked from commit 0b8033fdaa)

2026-06-22 16:28:56 -04:00

Gud Boi

90466ec016

Add `start_or_cancel()` to `trionics._taskc`

Wrapper around `trio.Nursery.start()` that DOESN'T mask
out-of-band cancellation as a lossy startup failure.
Picks the right re-raise: ambient `Cancelled` when
present, the genuine startup-protocol `RuntimeError`
otherwise.

The problem,
- `trio.Nursery.start()` raises a generic
  `RuntimeError("child exited without calling
  task_status.started()")` whenever the started task
  exits BEFORE calling `task_status.started()` —
  INCLUDING the common case where the child was
  cancelled out-of-band by an *ancestor* cancel-scope
  erroring/cancelling.
- In that case the original `trio.Cancelled` is
  swallowed and the caller is left w/ an opaque,
  root-cause-detached `RuntimeError`.

The fix,
- Catch the "...started" RTE.
- `await trio.lowlevel.checkpoint_if_cancelled()` —
  re-raises the in-flight `Cancelled` IFF we're under
  effective cancellation (ancestor-inclusive), carrying
  trio's auto-generated reason which points at the true
  root exc.
- If we're NOT cancelled the `checkpoint_if_cancelled()`
  is a cheap no-op and we fall through to re-raise the
  genuine startup-protocol RTE.

Re-export from `tractor.trionics` so callers don't have
to reach into `_taskc`.

(this patch was generated in some part by [`claude-code`][claude-code-gh])
[claude-code-gh]: https://github.com/anthropics/claude-code

(cherry picked from commit 30e15925ba)
(cherry picked from commit 2b4589b1ee)

2026-06-22 16:28:56 -04:00

Compare commits

2 Commits

023dbf89e4 ... a722d535d9

Diff Content Not Available

Compare commits

2 Commits 023dbf89e4 ... a722d535d9

Diff Content Not Available

2 Commits

023dbf89e4 ... a722d535d9