kaslo/synapse
1
0
Fork 0
Code Wiki Activity

Last successful stream ordering is about destinations

Browse Source
This commit is contained in:
Olivier Wilkinson (reivilibre)
2020-08-26 21:01:48 +01:00
parent 92517e95fc
commit ef4680df22
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
synapse/federation/sender/per_destination_queue.py
View File

@@ -363,7 +363,7 @@ class PerDestinationQueue(object):
self._last_successful_stream_order = (
final_pdu.internal_metadata.stream_ordering
)
await self._store.set_last_successful_stream_ordering(
await self._store.set_destination_last_successful_stream_ordering(
self._destination, self._last_successful_stream_order
)
else:
@@ -441,7 +441,7 @@ class PerDestinationQueue(object):
async def _catch_up_transmission_loop(self) -> None:
if self._last_successful_stream_order is None:
# first catch-up, so get from database
self._last_successful_stream_order = await self._store.get_last_successful_stream_ordering(
self._last_successful_stream_order = await self._store.get_destination_last_successful_stream_ordering(
self._destination
)
@@ -529,7 +529,7 @@ class PerDestinationQueue(object):
self._last_successful_stream_order = cast(
int, final_pdu.internal_metadata.stream_ordering
)
await self._store.set_last_successful_stream_ordering(
await self._store.set_destination_last_successful_stream_ordering(
self._destination, self._last_successful_stream_order
)

4
synapse/storage/databases/main/transactions.py
View File

@@ -265,7 +265,7 @@ class TransactionStore(SQLBaseStore):
"_cleanup_transactions", _cleanup_transactions_txn
)
async def get_last_successful_stream_ordering(
async def get_destination_last_successful_stream_ordering(
self, destination: str
) -> Optional[int]:
"""
@@ -283,7 +283,7 @@ class TransactionStore(SQLBaseStore):
desc="get_last_successful_stream_ordering",
)
async def set_last_successful_stream_ordering(
async def set_destination_last_successful_stream_ordering(
self, destination: str, last_successful_stream_ordering: int
) -> None:
"""

8
tests/federation/test_federation_catch_up.py
View File

@@ -213,7 +213,7 @@ class FederationCatchUpTestCases(FederatingHomeserverTestCase):
self.pump()
lsso_1 = self.get_success(
self.hs.get_datastore().get_last_successful_stream_ordering("host2")
self.hs.get_datastore().get_destination_last_successful_stream_ordering("host2")
)
self.assertIsNone(
@@ -227,7 +227,7 @@ class FederationCatchUpTestCases(FederatingHomeserverTestCase):
event_id_2 = self.helper.send(room, "rabbits!", tok=u1_token)["event_id"]
lsso_2 = self.get_success(
self.hs.get_datastore().get_last_successful_stream_ordering("host2")
self.hs.get_datastore().get_destination_last_successful_stream_ordering("host2")
)
row_2 = self.get_destination_room(room)
@@ -286,7 +286,7 @@ class FederationCatchUpTestCases(FederatingHomeserverTestCase):
event_2 = self.get_success(self.hs.get_datastore().get_event(event_id_2))
self.get_success(
self.hs.get_datastore().set_last_successful_stream_ordering(
self.hs.get_datastore().set_destination_last_successful_stream_ordering(
"host2", event_2.internal_metadata.stream_ordering
)
)
@@ -349,7 +349,7 @@ class FederationCatchUpTestCases(FederatingHomeserverTestCase):
event_2 = self.get_success(self.hs.get_datastore().get_event(event_id_2))
self.get_success(
self.hs.get_datastore().set_last_successful_stream_ordering(
self.hs.get_datastore().set_destination_last_successful_stream_ordering(
"host2", event_2.internal_metadata.stream_ordering
)
)

2
tests/handlers/test_typing.py
View File

@@ -161,7 +161,7 @@ class TypingNotificationsTestCase(unittest.HomeserverTestCase):
None
)
self.datastore.get_last_successful_stream_ordering = lambda *args, **kwargs: defer.succeed(
self.datastore.get_destination_last_successful_stream_ordering = lambda *args, **kwargs: defer.succeed(
None
)