kaslo/synapse
1
0
Fork 0
Code Wiki Activity

Don't cancel Deferreds that readers or writers are waiting on

Browse Source
This commit is contained in:
Sean Quah
2022-02-25 19:27:31 +00:00
parent 2b5f3ed4ce
commit 0e118a09b7
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
synapse/util/async_helpers.py
View File

@@ -529,9 +529,10 @@ class ReadWriteLock:
# We wait for the latest writer to finish writing. We can safely ignore
# any existing readers... as they're readers.
# May raise a `CancelledError` if the `Deferred` wrapping us is
# cancelled.
# cancelled. The `Deferred` we are waiting on must not be cancelled,
# since we do not own it.
if curr_writer:
await make_deferred_yieldable(curr_writer)
await make_deferred_yieldable(stop_cancellation(curr_writer))
yield
finally:
with PreserveLoggingContext():
@@ -562,8 +563,9 @@ class ReadWriteLock:
try:
# Wait for all current readers and the latest writer to finish.
# May raise a `CancelledError` if the `Deferred` wrapping us is
# cancelled.
await make_deferred_yieldable(to_wait_on_defer)
# cancelled. The `Deferred`s we are waiting on must not be cancelled,
# since we do not own them.
await make_deferred_yieldable(stop_cancellation(to_wait_on_defer))
yield
finally: