mirror of
https://mau.dev/maunium/synapse.git
synced 2024-07-20 01:52:17 +00:00
8f35f8148e
* Fix bug where a new writer advances their token too quickly When starting a new writer (for e.g. persisting events), the `MultiWriterIdGenerator` doesn't have a minimum token for it as there are no rows matching that new writer in the DB. This results in the the first stream ID it acquired being announced as persisted *before* it actually finishes persisting, if another writer gets and persists a subsequent stream ID. This is due to the logic of setting the minimum persisted position to the minimum known position of across all writers, and the new writer starts off not being considered. * Fix sending out POSITIONs when our token advances without update Broke in #14820 * For replication HTTP requests, only wait for minimal position
87 lines
3.2 KiB
Python
87 lines
3.2 KiB
Python
# Copyright 2017 Vector Creations Ltd
|
|
# Copyright 2019 New Vector Ltd
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
from typing import TYPE_CHECKING, Any, Awaitable, Callable, List, Tuple
|
|
|
|
import attr
|
|
|
|
from synapse.replication.tcp.streams._base import (
|
|
Stream,
|
|
Token,
|
|
current_token_without_instance,
|
|
make_http_update_function,
|
|
)
|
|
from synapse.types import JsonDict
|
|
|
|
if TYPE_CHECKING:
|
|
from synapse.server import HomeServer
|
|
|
|
|
|
class FederationStream(Stream):
|
|
"""Data to be sent over federation. Only available when master has federation
|
|
sending disabled.
|
|
"""
|
|
|
|
@attr.s(slots=True, frozen=True, auto_attribs=True)
|
|
class FederationStreamRow:
|
|
type: str # the type of data as defined in the BaseFederationRows
|
|
data: JsonDict # serialization of a federation.send_queue.BaseFederationRow
|
|
|
|
NAME = "federation"
|
|
ROW_TYPE = FederationStreamRow
|
|
|
|
def __init__(self, hs: "HomeServer"):
|
|
if hs.config.worker.worker_app is None:
|
|
# master process: get updates from the FederationRemoteSendQueue.
|
|
# (if the master is configured to send federation itself, federation_sender
|
|
# will be a real FederationSender, which has stubs for current_token and
|
|
# get_replication_rows.)
|
|
federation_sender = hs.get_federation_sender()
|
|
self.current_token_func = current_token_without_instance(
|
|
federation_sender.get_current_token
|
|
)
|
|
update_function: Callable[
|
|
[str, int, int, int], Awaitable[Tuple[List[Tuple[int, Any]], int, bool]]
|
|
] = federation_sender.get_replication_rows
|
|
|
|
elif hs.should_send_federation():
|
|
# federation sender: Query master process
|
|
update_function = make_http_update_function(hs, self.NAME)
|
|
self.current_token_func = self._stub_current_token
|
|
|
|
else:
|
|
# other worker: stub out the update function (we're not interested in
|
|
# any updates so when we get a POSITION we do nothing)
|
|
update_function = self._stub_update_function
|
|
self.current_token_func = self._stub_current_token
|
|
|
|
super().__init__(hs.get_instance_name(), update_function)
|
|
|
|
def current_token(self, instance_name: str) -> Token:
|
|
return self.current_token_func(instance_name)
|
|
|
|
def minimal_local_current_token(self) -> Token:
|
|
return self.current_token(self.local_instance_name)
|
|
|
|
@staticmethod
|
|
def _stub_current_token(instance_name: str) -> int:
|
|
# dummy current-token method for use on workers
|
|
return 0
|
|
|
|
@staticmethod
|
|
async def _stub_update_function(
|
|
instance_name: str, from_token: int, upto_token: int, limit: int
|
|
) -> Tuple[list, int, bool]:
|
|
return [], upto_token, False
|