소스 검색

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

Andrew Morgan 1 년 전
부모
커밋
2ac6c3bbb5
2개의 변경된 파일2개의 추가작업 그리고 1개의 파일을 삭제
  1. 1 0
      changelog.d/15788.bugfix
  2. 1 1
      synapse/storage/database.py

+ 1 - 0
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.

+ 1 - 1
synapse/storage/database.py

@@ -1529,7 +1529,7 @@ class DatabasePool:
         # 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))