mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-08-06 04:54:15 -04:00
Handle cancellation in DatabasePool.runInteraction()
(#12199)
To handle cancellation, we ensure that `after_callback`s and `exception_callback`s are always run, since the transaction will complete on another thread regardless of cancellation. We also wait until everything is done before releasing the `CancelledError`, so that logging contexts won't get used after they have been finished. Signed-off-by: Sean Quah <seanq@element.io>
This commit is contained in:
parent
fc9bd620ce
commit
6121056740
3 changed files with 96 additions and 24 deletions
|
@ -15,6 +15,8 @@
|
|||
from typing import Callable, Tuple
|
||||
from unittest.mock import Mock, call
|
||||
|
||||
from twisted.internet import defer
|
||||
from twisted.internet.defer import CancelledError, Deferred
|
||||
from twisted.test.proto_helpers import MemoryReactor
|
||||
|
||||
from synapse.server import HomeServer
|
||||
|
@ -124,3 +126,59 @@ class CallbacksTestCase(unittest.HomeserverTestCase):
|
|||
)
|
||||
self.assertEqual(after_callback.call_count, 2) # no additional calls
|
||||
exception_callback.assert_not_called()
|
||||
|
||||
|
||||
class CancellationTestCase(unittest.HomeserverTestCase):
|
||||
def prepare(self, reactor: MemoryReactor, clock: Clock, hs: HomeServer) -> None:
|
||||
self.store = hs.get_datastores().main
|
||||
self.db_pool: DatabasePool = self.store.db_pool
|
||||
|
||||
def test_after_callback(self) -> None:
|
||||
"""Test that the after callback is called when a transaction succeeds."""
|
||||
d: "Deferred[None]"
|
||||
after_callback = Mock()
|
||||
exception_callback = Mock()
|
||||
|
||||
def _test_txn(txn: LoggingTransaction) -> None:
|
||||
txn.call_after(after_callback, 123, 456, extra=789)
|
||||
txn.call_on_exception(exception_callback, 987, 654, extra=321)
|
||||
d.cancel()
|
||||
|
||||
d = defer.ensureDeferred(
|
||||
self.db_pool.runInteraction("test_transaction", _test_txn)
|
||||
)
|
||||
self.get_failure(d, CancelledError)
|
||||
|
||||
after_callback.assert_called_once_with(123, 456, extra=789)
|
||||
exception_callback.assert_not_called()
|
||||
|
||||
def test_exception_callback(self) -> None:
|
||||
"""Test that the exception callback is called when a transaction fails."""
|
||||
d: "Deferred[None]"
|
||||
after_callback = Mock()
|
||||
exception_callback = Mock()
|
||||
|
||||
def _test_txn(txn: LoggingTransaction) -> None:
|
||||
txn.call_after(after_callback, 123, 456, extra=789)
|
||||
txn.call_on_exception(exception_callback, 987, 654, extra=321)
|
||||
d.cancel()
|
||||
# Simulate a retryable failure on every attempt.
|
||||
raise self.db_pool.engine.module.OperationalError()
|
||||
|
||||
d = defer.ensureDeferred(
|
||||
self.db_pool.runInteraction("test_transaction", _test_txn)
|
||||
)
|
||||
self.get_failure(d, CancelledError)
|
||||
|
||||
after_callback.assert_not_called()
|
||||
exception_callback.assert_has_calls(
|
||||
[
|
||||
call(987, 654, extra=321),
|
||||
call(987, 654, extra=321),
|
||||
call(987, 654, extra=321),
|
||||
call(987, 654, extra=321),
|
||||
call(987, 654, extra=321),
|
||||
call(987, 654, extra=321),
|
||||
]
|
||||
)
|
||||
self.assertEqual(exception_callback.call_count, 6) # no additional calls
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue