Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Add ability to cancel disconnected requests to SynapseRequest #12588

Merged
merged 4 commits into from
May 10, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions changelog.d/12588.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add ability to cancel disconnected requests to `SynapseRequest`.
24 changes: 23 additions & 1 deletion synapse/http/site.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import attr
from zope.interface import implementer

from twisted.internet.defer import Deferred
from twisted.internet.interfaces import IAddress, IReactorTime
from twisted.python.failure import Failure
from twisted.web.http import HTTPChannel
Expand Down Expand Up @@ -91,6 +92,13 @@ def __init__(
# we can't yet create the logcontext, as we don't know the method.
self.logcontext: Optional[LoggingContext] = None

# The `Deferred` to cancel if the client disconnects early. Expected to be set
# by `Resource.render`.
self.render_deferred: Optional["Deferred[None]"] = None
# A boolean indicating whether `_render_deferred` should be cancelled if the
# client disconnects early. Expected to be set during `Resource.render`.
self.is_render_cancellable = False

global _next_request_seq
self.request_seq = _next_request_seq
_next_request_seq += 1
Expand Down Expand Up @@ -357,7 +365,21 @@ def connectionLost(self, reason: Union[Failure, Exception]) -> None:
{"event": "client connection lost", "reason": str(reason.value)}
)

if not self._is_processing:
if self._is_processing:
if self.is_render_cancellable:
if self.render_deferred is not None:
# Throw a cancellation into the request processing, in the hope
# that it will finish up sooner than it normally would.
# The `self.processing()` context manager will call
# `_finished_processing()` when done.
with PreserveLoggingContext():
self.render_deferred.cancel()
else:
logger.error(
"Connection from client lost, but have no Deferred to "
"cancel even though the request is marked as cancellable."
)
else:
self._finished_processing()

def _started_processing(self, servlet_name: str) -> None:
Expand Down