Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-10-01 11:49:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make get_max_token into inlineCallbacks so that the lock works.

Browse Source
This commit is contained in:
Erik Johnston 2015-04-27 15:19:44 +01:00
parent 56f518d279
commit 8558e1ec73
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
synapse/storage/util/id_generators.py
View File

@ -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")