Skip to content

fix: handle TimeoutError in Actor __aexit__ to prevent resource leaks #776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vdusek merged 2 commits into from
Feb 11, 2026
Merged

fix: handle TimeoutError in Actor __aexit__ to prevent resource leaks #776

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57b0fd1
fix: handle TimeoutError in Actor __aexit__ to prevent resource leaks
vdusek Feb 11, 2026
ce4dfcf
Simplify TimeoutError handler: just log, don't attempt forced cleanup
vdusek Feb 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/apify/_actor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,8 +252,17 @@ async def finalize() -> None:
# Persist Actor state
await self._save_actor_state()

await asyncio.wait_for(finalize(), self._cleanup_timeout.total_seconds())
self._is_initialized = False
try:
await asyncio.wait_for(finalize(), self._cleanup_timeout.total_seconds())
except TimeoutError:
self.log.warning('Actor cleanup timed out, forcing shutdown of event manager and charging manager')
# Ensure critical resources are cleaned up even after timeout
with suppress(Exception):
await self.event_manager.__aexit__(None, None, None)
with suppress(Exception):
await self._charging_manager_implementation.__aexit__(None, None, None)
finally:
self._is_initialized = False

if self._exit_process:
sys.exit(self.exit_code)
Expand Down
Loading