mirror of
https://github.com/element-hq/synapse
synced 2024-08-20 02:40:22 +00:00
Don't lock user_ips table for upsert.
This commit is contained in:
parent
fabb7acd45
commit
657298cebd
2 changed files with 10 additions and 4 deletions
|
@ -104,6 +104,8 @@ class DataStore(RoomMemberStore, RoomStore,
|
|||
|
||||
self.client_ip_last_seen.prefill(*key + (now,))
|
||||
|
||||
# It's safe not to lock here: a) no unique constraint,
|
||||
# b) LAST_SEEN_GRANULARITY makes concurrent updates incredibly unlikely
|
||||
yield self._simple_upsert(
|
||||
"user_ips",
|
||||
keyvalues={
|
||||
|
@ -117,6 +119,7 @@ class DataStore(RoomMemberStore, RoomStore,
|
|||
"last_seen": now,
|
||||
},
|
||||
desc="insert_client_ip",
|
||||
lock=False,
|
||||
)
|
||||
|
||||
def get_user_ip_and_agents(self, user):
|
||||
|
|
|
@ -452,7 +452,7 @@ class SQLBaseStore(object):
|
|||
txn.execute(sql, values.values())
|
||||
|
||||
def _simple_upsert(self, table, keyvalues, values,
|
||||
insertion_values={}, desc="_simple_upsert"):
|
||||
insertion_values={}, desc="_simple_upsert", lock=True):
|
||||
"""
|
||||
Args:
|
||||
table (str): The table to upsert into
|
||||
|
@ -464,10 +464,13 @@ class SQLBaseStore(object):
|
|||
return self.runInteraction(
|
||||
desc,
|
||||
self._simple_upsert_txn, table, keyvalues, values, insertion_values,
|
||||
lock
|
||||
)
|
||||
|
||||
def _simple_upsert_txn(self, txn, table, keyvalues, values, insertion_values={}):
|
||||
# We need to lock the table :(
|
||||
def _simple_upsert_txn(self, txn, table, keyvalues, values, insertion_values={},
|
||||
lock=True):
|
||||
# We need to lock the table :(, unless we're *really* careful
|
||||
if lock:
|
||||
self.database_engine.lock_table(txn, table)
|
||||
|
||||
# Try to update
|
||||
|
|
Loading…
Reference in a new issue