From 2732be83d9e883184f4a783fb7ba15487f30c20d Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Mon, 27 Apr 2015 13:22:30 +0100
Subject: Shuffle operations so that locking upsert happens last in the txn.
 This ensures the lock is held for the least amount of time possible.

---
 synapse/storage/_base.py | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'synapse/storage/_base.py')

diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py
index 874d41447a..6017c2a6e8 100644
--- a/synapse/storage/_base.py
+++ b/synapse/storage/_base.py
@@ -466,6 +466,9 @@ class SQLBaseStore(object):
         )
 
     def _simple_upsert_txn(self, txn, table, keyvalues, values, insertion_values={}):
+        # We need to lock the table :(
+        self.database_engine.lock_table(txn, table)
+
         # Try to update
         sql = "UPDATE %s SET %s WHERE %s" % (
             table,
-- 
cgit 1.4.1