Skip to content

Make DrainableWorker drain off outstanding count#1514

Merged
juliusmarminge merged 1 commit intomainfrom
feature/drainable-worker-counter
Mar 29, 2026
Merged

Make DrainableWorker drain off outstanding count#1514
juliusmarminge merged 1 commit intomainfrom
feature/drainable-worker-counter

Conversation

@juliusmarminge
Copy link
Copy Markdown
Member

@juliusmarminge juliusmarminge commented Mar 29, 2026

  • Track queued and in-flight items with a single STM counter
  • Simplify drain and enqueue around the shared outstanding signal

What Changed

Why

UI Changes

Checklist

  • This PR is small and focused
  • I explained what changed and why
  • I included before/after screenshots for any UI changes
  • I included a video for animation/interaction changes

Note

Medium Risk
Changes STM concurrency semantics for drain() by relying on a single counter updated on enqueue/complete, which could regress drain behavior under edge cases (failed offers, interruptions). Minor API/typing risk if callers relied on enqueue’s previous return type/behavior.

Overview
DrainableWorker now tracks both queued and in-flight work via a single STM outstanding counter that is incremented atomically in enqueue and decremented when process finishes.

drain() is simplified to retry solely based on outstanding > 0, removing the previous logic that also checked TxQueue.isEmpty and incremented the counter on take().

Written by Cursor Bugbot for commit 15905ec. This will update automatically on new commits. Configure here.

Note

Make DrainableWorker drain off outstanding count atomically

  • enqueue now atomically increments an outstanding counter alongside queuing the item in a single transaction, replacing the previous approach of incrementing on take.
  • drain() waits until the outstanding counter reaches zero, which means it resolves only after all enqueued items have finished processing, not just when the queue is empty.
  • The explicit TxQueue.isEmpty check in drain is removed, as the counter already subsumes it.
  • Behavioral Change: drain() now accounts for items currently being processed, making it safe to use as a deterministic completion signal in tests.

Macroscope summarized 15905ec.

- Track queued and in-flight items with a single STM counter
- Simplify drain and enqueue around the shared outstanding signal
@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Mar 29, 2026

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: a90a86d3-f36e-40ca-8209-6f09d9846bda

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch feature/drainable-worker-counter

Comment @coderabbitai help to get the list of available commands and usage tips.

@github-actions github-actions bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:M 30-99 changed lines (additions + deletions). labels Mar 29, 2026
@juliusmarminge juliusmarminge merged commit 00f3efb into main Mar 29, 2026
11 checks passed
@juliusmarminge juliusmarminge deleted the feature/drainable-worker-counter branch March 29, 2026 05:52
sfncore pushed a commit to sfncore/t3code that referenced this pull request Mar 29, 2026
Upstream changes (v0.0.15):
- Refactor projection pipeline side effects (pingdotgg#1512)
- Inline sqlite error classification (pingdotgg#1515)
- DrainableWorker drain off outstanding count (pingdotgg#1514)
- Thread archiving with archivedAt (pingdotgg#1505-related migrations)
- Auto-generate first-turn thread titles (pingdotgg#1375)
- Keyboard shortcuts for sidebar threads (pingdotgg#1456)
- Various UI fixes (sidebar, settings, markdown links)

Conflict resolution:
- ProjectionPipeline.ts: took upstream (our REINDEX workaround
  no longer needed with doltlite canDefer=0 fix)
- Migrations.ts: renumbered our 016-018 to 019-021, keeping
  upstream's 016-018 (CanonicalizeModelSelections, ArchivedAt)
- ProjectionThreads.ts, orchestration.ts: took upstream (archiving)
- Sidebar files: took upstream (new features)

Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
AustinKelsay pushed a commit to AustinKelsay/t3code-custom that referenced this pull request Mar 29, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:M 30-99 changed lines (additions + deletions). vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant