Merge pull request #4818 from matrix-org/erikj/prefill_client_ips

Prefill client IPs cache on workers
2019-03-06 19:17:39 +00:00 · 2019-03-06 19:17:39 +00:00 · 1f85c2c0ce
parent 0a6e716600 366877c579
commit 1f85c2c0ce
2 changed files with 3 additions and 0 deletions
--- a/changelog.d/4818.bugfix
+++ b/changelog.d/4818.bugfix
@ -0,0 +1 @@
+Fix bug where we didn't correctly throttle sending of USER_IP commands over replication.
--- a/synapse/replication/slave/storage/client_ips.py
+++ b/synapse/replication/slave/storage/client_ips.py
@ -43,6 +43,8 @@ class SlavedClientIpStore(BaseSlavedStore):
        if last_seen is not None and (now - last_seen) < LAST_SEEN_GRANULARITY:
            return

+        self.client_ip_last_seen.prefill(key, now)
+
        self.hs.get_tcp_replication().send_user_ip(
            user_id, access_token, ip, user_agent, device_id, now
        )
				`@ -0,0 +1 @@`
				`Fix bug where we didn't correctly throttle sending of USER_IP commands over replication.`