From 584a1c0dcac55ea3ec00871402ffaaedb4ebf9d3 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 25 Jun 2015 14:13:47 +0100
Subject: [PATCH] Parallelise key storage

---
 synapse/crypto/keyring.py | 38 ++++++++++++++++++++++++--------------
 synapse/storage/events.py |  2 +-
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py
index 3bfe8fcbce..24d4213dc7 100644
--- a/synapse/crypto/keyring.py
+++ b/synapse/crypto/keyring.py
@@ -495,15 +495,20 @@ class Keyring(object):
         response_keys.update(verify_keys)
         response_keys.update(old_verify_keys)
 
-        for key_id in updated_key_ids:
-            yield self.store.store_server_keys_json(
-                server_name=server_name,
-                key_id=key_id,
-                from_server=server_name,
-                ts_now_ms=time_now_ms,
-                ts_expires_ms=ts_valid_until_ms,
-                key_json_bytes=signed_key_json_bytes,
-            )
+        yield defer.gatherResults(
+            [
+                self.store.store_server_keys_json(
+                    server_name=server_name,
+                    key_id=key_id,
+                    from_server=server_name,
+                    ts_now_ms=time_now_ms,
+                    ts_expires_ms=ts_valid_until_ms,
+                    key_json_bytes=signed_key_json_bytes,
+                )
+                for key_id in updated_key_ids
+            ],
+            consumeErrors=True,
+        ).addErrback(unwrapFirstError)
 
         results[server_name] = response_keys
 
@@ -591,8 +596,13 @@ class Keyring(object):
         Returns:
             A deferred that completes when the keys are stored.
         """
-        for key_id, key in verify_keys.items():
-            # TODO(markjh): Store whether the keys have expired.
-            yield self.store.store_server_verify_key(
-                server_name, server_name, key.time_added, key
-            )
+        # TODO(markjh): Store whether the keys have expired.
+        yield defer.gatherResults(
+            [
+                self.store.store_server_verify_key(
+                    server_name, server_name, key.time_added, key
+                )
+                for key_id, key in verify_keys.items()
+            ],
+            consumeErrors=True,
+        ).addErrback(unwrapFirstError)
diff --git a/synapse/storage/events.py b/synapse/storage/events.py
index 064490ae18..cbbe494386 100644
--- a/synapse/storage/events.py
+++ b/synapse/storage/events.py
@@ -78,7 +78,7 @@ class EventsStore(SQLBaseStore):
 
             for chunk in chunks:
                 # We can't easily parallelize these since different chunks
-                # might contain the same event. :()
+                # might contain the same event. :(
                 yield self.runInteraction(
                     "persist_events",
                     self._persist_events_txn,