mirror of
https://github.com/element-hq/synapse
synced 2024-08-20 14:20:23 +00:00
Make get_max_token into inlineCallbacks so that the lock works.
This commit is contained in:
parent
56f518d279
commit
8558e1ec73
1 changed files with 4 additions and 3 deletions
|
@ -105,21 +105,22 @@ class StreamIdGenerator(object):
|
|||
|
||||
return manager()
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def get_max_token(self, store):
|
||||
"""Returns the maximum stream id such that all stream ids less than or
|
||||
equal to it have been successfully persisted.
|
||||
"""
|
||||
with self._lock:
|
||||
if self._unfinished_ids:
|
||||
return self._unfinished_ids[0] - 1
|
||||
defer.returnValue(self._unfinished_ids[0] - 1)
|
||||
|
||||
if not self._current_max:
|
||||
return store.runInteraction(
|
||||
yield store.runInteraction(
|
||||
"_compute_current_max",
|
||||
self._compute_current_max,
|
||||
)
|
||||
|
||||
return self._current_max
|
||||
defer.returnValue(self._current_max)
|
||||
|
||||
def _compute_current_max(self, txn):
|
||||
txn.execute("SELECT MAX(stream_ordering) FROM events")
|
||||
|
|
Loading…
Reference in a new issue