Revert limiting of fetching, it didn't help perf.

1 files changed, 2 insertions, 9 deletions

diff --git a/synapse/storage/events.py b/synapse/storage/events.py

index f21364606d..98a5663932 100644
--- a/synapse/storage/events.py
+++ b/synapse/storage/events.py
@@ -505,15 +505,8 @@ class EventsStore(SQLBaseStore):
         while True:
             try:
                 with self._event_fetch_lock:
-                    tot = 0
-                    j = 0
-                    for j, lst in enumerate(self._event_fetch_list):
-                        if tot > 200:
-                            break
-                        tot += len(lst[0])
-
-                    event_list = self._event_fetch_list[:j+1]
-                    self._event_fetch_list = self._event_fetch_list[j+1:]
+                    event_list = self._event_fetch_list
+                    self._event_fetch_list = []
 
                     if not event_list:
                         if self.database_engine.single_threaded or i > 3: