diff options
| author | Erik Johnston <erikj@jki.re> | 2019-01-23 08:45:18 +0000 |
|---|---|---|
| committer | Amber Brown <hawkowl@atleastfornow.net> | 2019-01-23 19:45:18 +1100 |
| commit | 90743c9d8910679bb688070b3929f3005e106d00 (patch) | |
| tree | 4c2ae5d84c4d44125836546af2aca0e75439b102 | |
| parent | Support ACME for certificate provisioning (#4384) (diff) | |
| download | synapse-90743c9d8910679bb688070b3929f3005e106d00.tar.xz | |
Fixup removal of duplicate `user_ips` rows (#4432)
* Remove unnecessary ORDER BY clause * Add logging * Newsfile
| -rw-r--r-- | changelog.d/4432.misc | 1 | ||||
| -rw-r--r-- | synapse/storage/client_ips.py | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelog.d/4432.misc b/changelog.d/4432.misc new file mode 100644 index 0000000000..047061ed3c --- /dev/null +++ b/changelog.d/4432.misc @@ -0,0 +1 @@ +Apply a unique index to the user_ips table, preventing duplicates. diff --git a/synapse/storage/client_ips.py b/synapse/storage/client_ips.py index 78721a941a..b228a20ac2 100644 --- a/synapse/storage/client_ips.py +++ b/synapse/storage/client_ips.py @@ -143,6 +143,11 @@ class ClientIpStore(background_updates.BackgroundUpdateStore): # If it returns None, then we're processing the last batch last = end_last_seen is None + logger.info( + "Scanning for duplicate 'user_ips' rows in range: %s <= last_seen < %s", + begin_last_seen, end_last_seen, + ) + def remove(txn): # This works by looking at all entries in the given time span, and # then for each (user_id, access_token, ip) tuple in that range @@ -170,7 +175,6 @@ class ClientIpStore(background_updates.BackgroundUpdateStore): SELECT user_id, access_token, ip FROM user_ips WHERE {} - ORDER BY last_seen ) c INNER JOIN user_ips USING (user_id, access_token, ip) GROUP BY user_id, access_token, ip |