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

Prefill client IPs cache on workers
matrix-org · Mar 6, 2019 · 1f85c2c · 1f85c2c
2 parents 0a6e716 + 366877c
commit 1f85c2c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git 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.
diff --git a/synapse/replication/slave/storage/client_ips.py b/synapse/replication/slave/storage/client_ips.py
@@ -43,6 +43,8 @@ def insert_client_ip(self, user_id, access_token, ip, user_agent, device_id):
         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
         )
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix bug where we didn't correctly throttle sending of USER_IP commands over replication.