Merge pull request #3805 from matrix-org/erikj/limit_transaction_pdus…

…_edus Limit the number of PDUs/EDUs per fedreation transaction
matrix-org · Sep 6, 2018 · 654324e · 654324e
2 parents 1d371fc + b07a2cb
commit 654324e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/changelog.d/3805.misc b/changelog.d/3805.misc
@@ -0,0 +1 @@
+Limit the number of PDUs/EDUs per federation transaction
diff --git a/synapse/federation/transaction_queue.py b/synapse/federation/transaction_queue.py
@@ -463,7 +463,19 @@ def _transaction_transmission_loop(self, destination):
                 # pending_transactions flag.
 
                 pending_pdus = self.pending_pdus_by_dest.pop(destination, [])
+
+                # We can only include at most 50 PDUs per transactions
+                pending_pdus, leftover_pdus = pending_pdus[:50], pending_pdus[50:]
+                if leftover_pdus:
+                    self.pending_pdus_by_dest[destination] = leftover_pdus
+
                 pending_edus = self.pending_edus_by_dest.pop(destination, [])
+
+                # We can only include at most 100 EDUs per transactions
+                pending_edus, leftover_edus = pending_edus[:100], pending_edus[100:]
+                if leftover_edus:
+                    self.pending_edus_by_dest[destination] = leftover_edus
+
                 pending_presence = self.pending_presence_by_dest.pop(destination, {})
 
                 pending_edus.extend(
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Limit the number of PDUs/EDUs per federation transaction