Skip to content

Commit

Permalink
Fix three memory leaks (#12019)
Browse files Browse the repository at this point in the history
  • Loading branch information
abrookins authored Feb 22, 2024
1 parent 276da84 commit 17f42e9
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 5 deletions.
43 changes: 38 additions & 5 deletions src/prefect/_internal/concurrency/calls.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import dataclasses
import inspect
import threading
import weakref
from concurrent.futures._base import (
CANCELLED,
CANCELLED_AND_NOTIFIED,
Expand All @@ -32,21 +33,30 @@
T = TypeVar("T")
P = ParamSpec("P")


# Tracks the current call being executed
current_call: contextvars.ContextVar["Call"] = contextvars.ContextVar("current_call")
# Tracks the current call being executed. Note that storing the `Call`
# object for an async call directly in the contextvar appears to create a
# memory leak, despite the fact that we `reset` when leaving the context
# that sets this contextvar. A weakref avoids the leak and works because a)
# we already have strong references to the `Call` objects in other places
# and b) this is used for performance optimizations where we have fallback
# behavior if this weakref is garbage collected. A fix for issue #10952.
current_call: contextvars.ContextVar["weakref.ref[Call]"] = contextvars.ContextVar(
"current_call"
)

# Create a strong reference to tasks to prevent destruction during execution errors
_ASYNC_TASK_REFS = set()


def get_current_call() -> Optional["Call"]:
return current_call.get(None)
call_ref = current_call.get(None)
if call_ref:
return call_ref()


@contextlib.contextmanager
def set_current_call(call: "Call"):
token = current_call.set(call)
token = current_call.set(weakref.ref(call))
try:
yield
finally:
Expand Down Expand Up @@ -181,6 +191,29 @@ def result(self, timeout=None):
# Break a reference cycle with the exception in self._exception
self = None

def _invoke_callbacks(self):
"""
Invoke our done callbacks and clean up cancel scopes and cancel
callbacks. Fixes a memory leak that hung on to Call objects,
preventing garbage collection of Futures.
A fix for #10952.
"""
if self._done_callbacks:
done_callbacks = self._done_callbacks[:]
self._done_callbacks[:] = []

for callback in done_callbacks:
try:
callback(self)
except Exception:
logger.exception("exception calling callback for %r", self)

self._cancel_callbacks = []
if self._cancel_scope:
self._cancel_scope._callbacks = []
self._cancel_scope = None


@dataclasses.dataclass
class Call(Generic[T]):
Expand Down
5 changes: 5 additions & 0 deletions src/prefect/_internal/concurrency/cancellation.py
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,11 @@ def __exit__(self, exc_type, exc_val, exc_tb):
# Mark as cancelled
self.cancel(throw=False)

# TODO: Can we also delete the scope?
# We have to exit this scope to prevent leaking memory. A fix for
# issue #10952.
self._anyio_scope.__exit__(exc_type, exc_val, exc_tb)

super().__exit__(exc_type, exc_val, exc_tb)

if self.cancelled() and exc_type is not CancelledError:
Expand Down

0 comments on commit 17f42e9

Please sign in to comment.