Merge pull request #5418 from matrix-org/erikj/fix_send_fed_with_limit_zero

Fix bug sending federation transactions with lots of EDUs

2 files changed, 5 insertions, 0 deletions

diff --git a/changelog.d/5418.bugfix b/changelog.d/5418.bugfix
new file mode 100644

index 0000000000..3fd4d2a882
--- /dev/null
+++ b/changelog.d/5418.bugfix
@@ -0,0 +1 @@
+Fix bug where attempting to send transactions with large number of EDUs can fail.
diff --git a/synapse/storage/deviceinbox.py b/synapse/storage/deviceinbox.py

index 9b0a99cb49..4ea0deea4f 100644
--- a/synapse/storage/deviceinbox.py
+++ b/synapse/storage/deviceinbox.py
@@ -138,6 +138,10 @@ class DeviceInboxWorkerStore(SQLBaseStore):
         if not has_changed or last_stream_id == current_stream_id:
             return defer.succeed(([], current_stream_id))
 
+        if limit <= 0:
+            # This can happen if we run out of room for EDUs in the transaction.
+            return defer.succeed(([], last_stream_id))
+
         def get_new_messages_for_remote_destination_txn(txn):
             sql = (
                 "SELECT stream_id, messages_json FROM device_federation_outbox"