forked from MirrorHub/synapse
Apparently we can't do txn.rollback(), so raise and catch an exception instead.
This commit is contained in:
parent
c1a25756c2
commit
e062f2dfa8
1 changed files with 19 additions and 11 deletions
|
@ -47,6 +47,11 @@ import os
|
|||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
class _RollbackButIsFineException(Exception):
|
||||
""" This exception is used to rollback a transaction without implying
|
||||
something went wrong.
|
||||
"""
|
||||
pass
|
||||
|
||||
class DataStore(RoomMemberStore, RoomStore,
|
||||
RegistrationStore, StreamStore, ProfileStore, FeedbackStore,
|
||||
|
@ -71,6 +76,7 @@ class DataStore(RoomMemberStore, RoomStore,
|
|||
self.min_token -= 1
|
||||
stream_ordering = self.min_token
|
||||
|
||||
try:
|
||||
latest = yield self._db_pool.runInteraction(
|
||||
self._persist_pdu_event_txn,
|
||||
pdu=pdu,
|
||||
|
@ -78,6 +84,8 @@ class DataStore(RoomMemberStore, RoomStore,
|
|||
backfilled=backfilled,
|
||||
stream_ordering=stream_ordering,
|
||||
)
|
||||
except _RollbackButIsFineException as e:
|
||||
pass
|
||||
defer.returnValue(latest)
|
||||
|
||||
@defer.inlineCallbacks
|
||||
|
@ -175,12 +183,12 @@ class DataStore(RoomMemberStore, RoomStore,
|
|||
try:
|
||||
self._simple_insert_txn(txn, "events", vals)
|
||||
except:
|
||||
logger.exception(
|
||||
logger.warn(
|
||||
"Failed to persist, probably duplicate: %s",
|
||||
event.event_id
|
||||
event.event_id,
|
||||
exc_info=True,
|
||||
)
|
||||
txn.rollback()
|
||||
return
|
||||
raise _RollbackButIsFineException("_persist_event")
|
||||
|
||||
if not backfilled and hasattr(event, "state_key"):
|
||||
vals = {
|
||||
|
|
Loading…
Reference in a new issue