Merge pull request #5792 from matrix-org/erikj/fix_bg_update

Fix current_state_events membership background update.
matrix-org · Jul 30, 2019 · 62a2d60 · 62a2d60
2 parents 7a48d0b + 958d69f
commit 62a2d60
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 1 deletion.
diff --git a/changelog.d/5792.misc b/changelog.d/5792.misc
@@ -0,0 +1 @@
+Reduce database IO usage by optimising queries for current membership.
diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py
@@ -935,7 +935,7 @@ def _background_current_state_membership_txn(txn, last_processed_room):
             while processed < batch_size:
                 txn.execute(
                     """
-                        SELECT MIN(room_id) FROM rooms WHERE room_id > ?
+                        SELECT MIN(room_id) FROM current_state_events WHERE room_id > ?
                     """,
                     (last_processed_room,),
                 )

diff --git a/...ta/56/current_state_events_membership.sql → ...6/current_state_events_membership_mk2.sql b/...ta/56/current_state_events_membership.sql → ...6/current_state_events_membership_mk2.sql