diff options
| author | Erik Johnston <erik@matrix.org> | 2020-04-29 14:10:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-29 14:10:59 +0100 |
| commit | 3eab76ad43e1de4074550c468d11318d497ff632 (patch) | |
| tree | 919ff2563327b2cef97a1c1625122fdc4fe7815f /synapse/replication/tcp/redis.py | |
| parent | Fix limit logic for EventsStream (#7358) (diff) | |
| download | synapse-3eab76ad43e1de4074550c468d11318d497ff632.tar.xz | |
Don't relay REMOTE_SERVER_UP cmds to same conn. (#7352)
For direct TCP connections we need the master to relay REMOTE_SERVER_UP commands to the other connections so that all instances get notified about it. The old implementation just relayed to all connections, assuming that sending back to the original sender of the command was safe. This is not true for redis, where commands sent get echoed back to the sender, which was causing master to effectively infinite loop sending and then re-receiving REMOTE_SERVER_UP commands that it sent. The fix is to ensure that we only relay to *other* connections and not to the connection we received the notification from. Fixes #7334.
Diffstat (limited to 'synapse/replication/tcp/redis.py')
| -rw-r--r-- | synapse/replication/tcp/redis.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/replication/tcp/redis.py b/synapse/replication/tcp/redis.py index 49b3ed0c5e..617e860f95 100644 --- a/synapse/replication/tcp/redis.py +++ b/synapse/replication/tcp/redis.py @@ -112,7 +112,7 @@ class RedisSubscriber(txredisapi.SubscriberProtocol, AbstractConnection): # Then call out to the handler. cmd_func = getattr(self.handler, "on_%s" % (cmd.NAME,), None) if cmd_func: - await cmd_func(cmd) + await cmd_func(self, cmd) handled = True if not handled: |