diff --git a/synapse/events/__init__.py b/synapse/events/__init__.py
index bcb8f33a58..8c71aeb5e4 100644
--- a/synapse/events/__init__.py
+++ b/synapse/events/__init__.py
@@ -36,6 +36,15 @@ class _EventInternalMetadata(object):
def is_invite_from_remote(self):
return getattr(self, "invite_from_remote", False)
+ def get_send_on_behalf_of(self):
+ """Whether this server should send the event on behalf of another server.
+ This is used by the federation "send_join" API to forward the initial join
+ event for a server in the room.
+
+ returns a str with the name of the server this event is sent on behalf of.
+ """
+ return getattr(self, "get_send_on_behalf_of", None)
+
def _event_dict_property(key):
def getter(self):
diff --git a/synapse/federation/transaction_queue.py b/synapse/federation/transaction_queue.py
index 51b656d74a..7db7b806dc 100644
--- a/synapse/federation/transaction_queue.py
+++ b/synapse/federation/transaction_queue.py
@@ -19,7 +19,6 @@ from twisted.internet import defer
from .persistence import TransactionActions
from .units import Transaction, Edu
-from synapse.api.constants import EventTypes, Membership
from synapse.api.errors import HttpResponseException
from synapse.util.async import run_on_reactor
from synapse.util.logcontext import preserve_context_over_fn
@@ -62,6 +61,7 @@ class TransactionQueue(object):
self.transport_layer = hs.get_federation_transport_client()
self.clock = hs.get_clock()
+ self.is_mine_id = hs.is_mine_id
# Is a mapping from destinations -> deferreds. Used to keep track
# of which destinations have transactions in flight and when they are
@@ -153,17 +153,32 @@ class TransactionQueue(object):
break
for event in events:
+ # Only send events for this server.
+ send_on_behalf_of = event.internal_metadata.get_send_on_behalf_of()
+ is_mine = self.is_mine_id(event.event_id)
+ if not is_mine and send_on_behalf_of is None:
+ continue
+
+ # Get the state from before the event.
+ # We need to make sure that this is the state from before
+ # the event and not from after it.
+ # Otherwise if the last member on a server in a room is
+ # banned then it won't receive the event because it won't
+ # be in the room after the ban.
users_in_room = yield self.state.get_current_user_in_room(
- event.room_id, latest_event_ids=[event.event_id],
+ event.room_id, latest_event_ids=[
+ prev_id for prev_id, _ in event.prev_events
+ ],
)
destinations = set(
get_domain_from_id(user_id) for user_id in users_in_room
)
-
- if event.type == EventTypes.Member:
- if event.content["membership"] == Membership.JOIN:
- destinations.add(get_domain_from_id(event.state_key))
+ if send_on_behalf_of is not None:
+ # If we are sending the event on behalf of another server
+ # then it already has the event and there is no reason to
+ # send the event to it.
+ destinations.discard(send_on_behalf_of)
logger.debug("Sending %s to %r", event, destinations)
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 1d07e4d02b..8c93d6d39f 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -790,6 +790,10 @@ class FederationHandler(BaseHandler):
)
event.internal_metadata.outlier = False
+ # Send this event on behalf of the origin server since they may not
+ # have an up to data view of the state of the room at this event so
+ # will not know which servers to send the event to.
+ event.internal_metadata.send_on_behalf_of = origin
context, event_stream_id, max_stream_id = yield self._handle_new_event(
origin, event
diff --git a/synapse/storage/events.py b/synapse/storage/events.py
index ecb79c07ef..04dbdac3f8 100644
--- a/synapse/storage/events.py
+++ b/synapse/storage/events.py
@@ -1084,8 +1084,10 @@ class EventsStore(SQLBaseStore):
self._do_fetch
)
+ logger.info("Loading %d events", len(events))
with PreserveLoggingContext():
rows = yield events_d
+ logger.info("Loaded %d events (%d rows)", len(events), len(rows))
if not allow_rejected:
rows[:] = [r for r in rows if not r["rejects"]]
diff --git a/synapse/util/async.py b/synapse/util/async.py
index 4280455cbe..83875edc85 100644
--- a/synapse/util/async.py
+++ b/synapse/util/async.py
@@ -166,7 +166,11 @@ class Linearizer(object):
# do some work.
"""
- def __init__(self):
+ def __init__(self, name=None):
+ if name is None:
+ self.name = id(self)
+ else:
+ self.name = name
self.key_to_defer = {}
@defer.inlineCallbacks
@@ -185,15 +189,20 @@ class Linearizer(object):
self.key_to_defer[key] = new_defer
if current_defer:
- logger.info("Waiting to acquire linearizer lock for key %r", key)
+ logger.info(
+ "Waiting to acquire linearizer lock %r for key %r", self.name, key
+ )
with PreserveLoggingContext():
yield current_defer
+ logger.info("Acquired linearizer lock %r for key %r", self.name, key)
+
@contextmanager
def _ctx_manager():
try:
yield
finally:
+ logger.info("Releasing linearizer lock %r for key %r", self.name, key)
new_defer.callback(None)
current_d = self.key_to_defer.get(key)
if current_d is new_defer:
|
