Don't always lock "user_ips" table when performing non-native upsert (#…

…15788)
matrix-org · Jun 16, 2023 · 2ac6c3b · 2ac6c3b
1 parent 0618bf9
commit 2ac6c3b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/changelog.d/15788.bugfix b/changelog.d/15788.bugfix
@@ -0,0 +1 @@
+Fix a bug introduced in 1.57.0 where the wrong table would be locked on updating database rows when using SQLite as the database backend.
diff --git a/synapse/storage/database.py b/synapse/storage/database.py
@@ -1529,7 +1529,7 @@ def simple_upsert_many_txn_emulated(
         # Lock the table just once, to prevent it being done once per row.
         # Note that, according to Postgres' documentation, once obtained,
         # the lock is held for the remainder of the current transaction.
-        self.engine.lock_table(txn, "user_ips")
+        self.engine.lock_table(txn, table)
 
         for keyv, valv in zip(key_values, value_values):
             _keys = dict(zip(key_names, keyv))