TaskDatasetServer concurrent close not blocking start/step/etc#353
Merged
jamesbraza merged 1 commit intomainfrom Apr 16, 2026
Merged
TaskDatasetServer concurrent close not blocking start/step/etc#353jamesbraza merged 1 commit intomainfrom
TaskDatasetServer concurrent close not blocking start/step/etc#353jamesbraza merged 1 commit intomainfrom
Conversation
jamesbraza
requested review from
MicPie,
albertbou92,
alexandonian,
elimoss,
mskarlin,
sidnarayanan and
whitead
dosubot
bot
added
the
size:S
jamesbraza
changed the title
TaskDatasetServer concurrent closeTaskDatasetServer concurrent close not blocking start/step/etc
There was a problem hiding this comment.
Pull request overview
This PR addresses a concurrency bottleneck in TaskDatasetServer by ensuring /close_old_envs no longer holds the global self.lock while awaiting environment shutdowns, allowing other endpoints (e.g. /start, /step) to proceed during slow closes.
Changes:
- Update
/close_old_envsto remove stale envs fromself.envsunder lock, then release the lock before awaitingenv.close()calls. - Refactor test client creation into a helper and add a regression test asserting
/close_old_envsdoesn’t block concurrent requests.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
src/aviary/dataset_server.py |
Releases the server lock before awaiting slow env.close() operations in /close_old_envs. |
tests/test_envs.py |
Adds a concurrency regression test and refactors test client creation for the dataset server endpoints. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Previously the handler held self.lock across an asyncio.gather() of env.close() calls, stalling every lock-acquiring endpoint (/start, /reset, /step, /close) for the duration of shutdown. Pop the stale envs from self.envs under the lock, then release it before awaiting the closes — matches the pattern /close already uses and prevents handler pileups during mass cleanup. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
jamesbraza
force-pushed
the
concurrency-task-dataset-close
branch
from
799e560 to
8578ac0
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
TaskDatasetServer's/close_old_envspreviously held theself.envsprotection lock acrossasyncio.gather(env.close ...), stalling other endpoints like/startand/stepduring the shutdown. This PR fixes that concurrency issues.